diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2015-01-06 16:56:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 16:56:46 +0000 |
| commit | 59820738fd75d1c1311d30280f82f51d251c8d66 (patch) | |
| tree | 17b000d62af93f456f687ea75b1563b8b731b6c8 /policy/src | |
| parent | 932bfab9aaa58f116935eb0a1f22de49301724c4 (diff) | |
| parent | d8aa4660b02b8a4a51e3ddbd347c306c41339576 (diff) | |
| download | frameworks_base-59820738fd75d1c1311d30280f82f51d251c8d66.zip frameworks_base-59820738fd75d1c1311d30280f82f51d251c8d66.tar.gz frameworks_base-59820738fd75d1c1311d30280f82f51d251c8d66.tar.bz2 | |
am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height"
* commit 'd8aa4660b02b8a4a51e3ddbd347c306c41339576':
Do not allow the navigation bar to move if width == height
Diffstat (limited to 'policy/src')
| -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 c37cf75..f8c630e 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1430,8 +1430,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. |