diff options
| author | 2015-01-06 16:50:56 +0000 | |
|---|---|---|
| committer | 2015-01-06 16:50:56 +0000 | |
| commit | d8aa4660b02b8a4a51e3ddbd347c306c41339576 (patch) | |
| tree | a4a54212d5ea8e42f327986a1519a9e1e230fbfd | |
| parent | 3787decd8d41320ec9201405ec4cc893b2c99d78 (diff) | |
| parent | da90a9c2355841bb98c2a669446b93ffe487a829 (diff) | |
am da90a9c2: Merge "Do not allow the navigation bar to move if width == height"
* commit 'da90a9c2355841bb98c2a669446b93ffe487a829':
Do not allow the navigation bar to move if width == height
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 1502829467a8..b310e04f767b 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 @@ public class PhoneWindowManager implements WindowManagerPolicy { 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. |