diff options
| author | 2015-01-06 20:09:30 +0000 | |
|---|---|---|
| committer | 2015-01-06 20:09:30 +0000 | |
| commit | 803aa1791805ca1846407fc7c62f96bc711cf1a9 (patch) | |
| tree | 1d57c0298abdc68eb90fc14d73b6bf1f8e8446ff | |
| parent | 8ca07337a692d22bf95b118ecd3a29e6bf423fb0 (diff) | |
| parent | 59820738fd75d1c1311d30280f82f51d251c8d66 (diff) | |
am 59820738: am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height"
* commit '59820738fd75d1c1311d30280f82f51d251c8d66':
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 c37cf7506cfd..f8c630e58bc2 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. |