commit 9aff050f1c86dacc3bba054cc0a3479635451a6e
author Max Weninger <max.weninger@gmail.com> Mon Dec 30 23:13:01 2013 +0100
committer Gerrit Code Review <gerrit2@gerrit> Mon Dec 30 23:13:01 2013 +0100
tree 83d9d8d76ea103614e13365956309644463d4f2d
parent e5f5faf40eb2ac87f53ae7f476b63bf49b74b0e9
parent fb2b28900e4c7bebcb4a38afc3ffdf3369dd5b33

Merge "navbar: show menu if nav bars are force enabled via property" into android-4.4

src/org/omnirom/omnigears/interfacesettings/BarsSettings.java

diff --git a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
index c573f6e..99fced9 100644
--- a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
@@ -25,6 +25,7 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
@@ -89,7 +90,11 @@
         mStatusBarNetworkActivity.setOnPreferenceChangeListener(this);
         mStatusBarNetworkActivity.setOnPreferenceChangeListener(this);
 
-        boolean hasNavBar = getResources().getBoolean(com.android.internal.R.bool.config_showNavigationBar);
+        boolean hasNavBar = getResources().getBoolean(
+                com.android.internal.R.bool.config_showNavigationBar);
+        // Also check, if users without navigation bar force enabled it.
+        hasNavBar = hasNavBar || (SystemProperties.getInt("qemu.hw.mainkeys", 1) == 0);
+
         // Hide navigation bar category on devices without navigation bar
         if (!hasNavBar) {
             prefSet.removePreference(findPreference(CATEGORY_NAVBAR));