commit d7b12b44db17b7a7c4b511273f15234f7b050f84
author Devin Kim <dojip.kim@lge.com> Mon May 05 14:34:58 2014 -0700
committer Wale Ogunwale <ogunwale@google.com> Sat Jan 03 14:09:19 2015 -0800
tree 4f540dcb26c077afd5e588c8657d703847373e40
parent 4fa039dfb1a5a23dad493f3c8c2c7529ecc1e96d

Do not allow the navigation bar to move if width == height

If width == height and mNavigationBarCanMove is true, the navigation bar
doesn't shows properly. Because wm doesn't know if the device is in landscape
mode or portrait mode.

Change-Id: I2077eacae50e6e498767f5c93b697e0459ad07fe
Signed-off-by: Devin Kim <dojip.kim@lge.com>

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 1502829..b310e04 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1190,8 +1190,8 @@
         int shortSizeDp = shortSize * DisplayMetrics.DENSITY_DEFAULT / density;
         int longSizeDp = longSize * DisplayMetrics.DENSITY_DEFAULT / density;
 
-        // Allow the navigation bar to move on small devices (phones).
-        mNavigationBarCanMove = shortSizeDp < 600;
+        // Allow the navigation bar to move on non-square small devices (phones).
+        mNavigationBarCanMove = width != height && shortSizeDp < 600;
 
         mHasNavigationBar = res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);
         // Allow a system property to override this. Used by the emulator.