Merge "Moved hardware keys from interface/general/ to interface/ Patchset daproy#2: Fixed derp Patchset daproy#3: Removed some TRD lines that jumped in Patchset daproy#4: Removed unneded imports" into jb4.2

Author: kufikugel

res/xml/interface_settings.xml

@@ -37,6 +37,11 @@
         android:fragment="com.android.settings.slim.UserInterface"
         android:title="@string/title_slim_general" />
 
+     <PreferenceScreen
+        android:key="hardware_keys"
+        android:fragment="com.android.settings.slim.HardwareKeys"
+        android:title="@string/hardware_keys_title" />
+
     <PreferenceScreen
         android:key="keyboard_input_settings"
         android:fragment="com.android.settings.slim.KeyboardInputSettings"

res/xml/user_interface_settings.xml

@@ -33,11 +33,6 @@
             android:key="custom_carrier_label"
             android:title="@string/custom_carrier_label_title" />
 
-        <PreferenceScreen
-            android:key="hardware_keys"
-            android:fragment="com.android.settings.slim.HardwareKeys"
-            android:title="@string/hardware_keys_title" />
-
         <CheckBoxPreference
             android:key="high_end_gfx"
             android:title="@string/high_end_gfx_title"

src/com/android/settings/slim/InterfaceSettings.java

@@ -44,6 +44,8 @@ public class InterfaceSettings extends SettingsPreferenceFragment implements
 
     private final Configuration mCurConfig = new Configuration();
 
+    private static final String KEY_HARDWARE_KEYS = "hardware_keys";
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -52,7 +54,18 @@ public void onCreate(Bundle savedInstanceState) {
 
         removePreferenceIfPackageNotInstalled(findPreference(KEY_CHRONUS));
 
-     }
+        // Only show the hardware keys config on a device that does not have a navbar
+        IWindowManager windowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(Context.WINDOW_SERVICE));
+
+        final boolean hasNavBarByDefault = getResources().getBoolean(
+                com.android.internal.R.bool.config_showNavigationBar);
+
+        if (hasNavBarByDefault) {
+            // Let's assume they don't have hardware keys
+            getPreferenceScreen().removePreference(findPreference(KEY_HARDWARE_KEYS));
+        }
+    }
 
     @Override
     public void onResume() {

src/com/android/settings/slim/UserInterface.java

@@ -25,7 +25,6 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -35,7 +34,6 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.text.Spannable;
-import android.view.IWindowManager;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -48,7 +46,6 @@ public class UserInterface extends SettingsPreferenceFragment implements OnPrefe
 
     private static final String MISC_SETTINGS = "misc";
     private static final String PREF_USE_ALT_RESOLVER = "use_alt_resolver";
-    private static final String KEY_HARDWARE_KEYS = "hardware_keys";
     private static final String KEY_RECENTS_RAM_BAR = "recents_ram_bar";
     private static final String KEY_DUAL_PANE = "dual_pane";
     private static final String KEY_HIGH_END_GFX = "high_end_gfx";
@@ -96,18 +93,6 @@ public void onCreate(Bundle savedInstanceState) {
         }
         mLcdDensity.setSummary(getResources().getString(R.string.current_lcd_density) + currentProperty);
 
-        // Only show the hardware keys config on a device that does not have a navbar
-        IWindowManager windowManager = IWindowManager.Stub.asInterface(
-                ServiceManager.getService(Context.WINDOW_SERVICE));
-
-        final boolean hasNavBarByDefault = getResources().getBoolean(
-                com.android.internal.R.bool.config_showNavigationBar);
-
-        if (hasNavBarByDefault) {
-            // Let's assume they don't have hardware keys
-            mMisc.removePreference(findPreference(KEY_HARDWARE_KEYS));
-        }
-
         mRamBar = findPreference(KEY_RECENTS_RAM_BAR);
         updateRamBar();