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
This commit is contained in:
Olawale Ogunwale
2015-01-06 16:56:46 +00:00
committed by Android Git Automerger

View File

@@ -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.