Merge "FW : Screen Sizing for TabUI when HiddenNav Enabled" into jb-mr1

AOKP · Apr 15, 2013 · e2c5042 · e2c5042
2 parents a8496a0 + ab16e75
commit e2c5042
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1172,7 +1172,6 @@ public void setInitialDisplaySize(Display display, int width, int height, int de
         } else {
             mStockUIMode = 2; // Phablet Mode
         } // Tablet Mode will be mode ==1 but no devices default to Tablet mode since 4.2
-
         mUserUIMode = Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.USER_UI_MODE,mStockUIMode);
         switch (mUserUIMode) {
@@ -1183,6 +1182,7 @@ public void setInitialDisplaySize(Display display, int width, int height, int de
                 break;
             case 1 :
                 // "tablet" UI with a single combined status & navigation bar
+                mNavBarAutoHide = false; // TabUI, No AutoHide for you!
                 mHasSystemNavBar = true;
                 mNavigationBarCanMove = false;
                 break;
@@ -1365,9 +1365,9 @@ public void updateSettings() {
                 Settings.System.USER_UI_MODE,mStockUIMode)) {
             resetScreenHelper();
         }
-        if (NavHide != mNavBarAutoHide) {
-        	mNavBarAutoHide = NavHide;
-        	resetScreenHelper();
+        if (NavHide != mNavBarAutoHide && mUserUIMode != 1) {
+            mNavBarAutoHide = NavHide;
+            resetScreenHelper();
         }
     }