summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-10-24 12:27:53 -0700
committerXavier Ducrohet <xav@android.com>2011-10-24 13:15:58 -0700
commitb0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee (patch)
tree7c144ecf908a71e45f810f73cb858d65d715e35f /policy/src
parent084369fb5e738e4db6ae94b4e24e777bdd9d9c2c (diff)
downloadframeworks_base-b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee.zip
frameworks_base-b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee.tar.gz
frameworks_base-b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee.tar.bz2
CherryPick 35530d from master to mr0. do not merge.
qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys. If it has main keys, then the navigation bar is *not* displayed. Change-Id: Idb36a1f787360363a009463f0c016a423594a5b9
Diffstat (limited to 'policy/src')
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java4
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 fd6eceb..318ad9e 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -827,8 +827,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// See also hasNavigationBar().
String navBarOverride = SystemProperties.get("qemu.hw.mainkeys");
if (! "".equals(navBarOverride)) {
- if (navBarOverride.equals("1")) mHasNavigationBar = true;
- else if (navBarOverride.equals("0")) mHasNavigationBar = false;
+ if (navBarOverride.equals("1")) mHasNavigationBar = false;
+ else if (navBarOverride.equals("0")) mHasNavigationBar = true;
}
mNavigationBarHeight = mHasNavigationBar