Merge pull request #269 from UnityTech/androidfix

Androidfix

Author: Yuncong Zhang

Runtime/Plugins/platform/android/view/UIWidgetsViewController.java

@@ -34,17 +34,29 @@ public static UIWidgetsViewController getInstance() {
     private UIWidgetsViewMetrics viewMetrics;
     private boolean keyboardOpen;
 
+    private float statusHeight;
+    private float navigationBarHeight;
+    
     private void setup() {
         //Log.i("tag", "On Setup 2");
 
         keyboardOpen = false;
         viewMetrics = new UIWidgetsViewMetrics();
-        
+        setupHeights();
         updateViewMetrics();
 
         setupViewMetricsChangedListener();
     }
 
+    private void setupHeights() {
+        final View unityView = ((ViewGroup)UnityPlayer.currentActivity.findViewById(android.R.id.content)).getChildAt(0);
+        Rect rect = new Rect();
+        unityView.getWindowVisibleDisplayFrame(rect);
+        
+        statusHeight = rect.top;
+        navigationBarHeight = unityView.getRootView().getHeight() - rect.bottom;
+    }
+    
     public static UIWidgetsViewMetrics getMetrics() {
         UIWidgetsViewController controller = getInstance();
         return controller.viewMetrics;
@@ -143,6 +155,10 @@ public void updateViewMetrics() {
         viewMetrics.insets_bottom = navigationBarHidden? calculateBottomKeyboardInset(rect) : rect.bottom;
         viewMetrics.insets_left = 0;
 
+        //adjust
+        viewMetrics.insets_bottom -= navigationBarHeight;
+        viewMetrics.padding_top -= statusHeight;
+        
         //Log.i("UIWidgetsDebug", "checks: " + navigationBarHidden + " " + rect.bottom);
         //Log.i("UIWidgetsDebug", " padding: " + viewMetrics.padding_top + " " + viewMetrics.padding_right + " " + viewMetrics.padding_bottom + " " + viewMetrics.padding_left);
         //Log.i("UIWidgetsDebug", " insets: " + viewMetrics.insets_top + " " + viewMetrics.insets_right + " " + viewMetrics.insets_bottom + " " + viewMetrics.insets_left);