diff --git a/res/values/config.xml b/res/values/config.xml
index 5afa65b..07f9d3f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -26,4 +26,8 @@
 
     <!-- Volume rocker support. Some devices do not have a volume rocker. -->
     <bool name="config_has_volume_rocker">true</bool>
+
+    <!-- Whether device has hardware buttons -->
+    <bool name="config_has_hardware_buttons">false</bool>
+
 </resources>
diff --git a/res/values/custom_arrays.xml b/res/values/custom_arrays.xml
index cb8a4d0..44c0cd2 100644
--- a/res/values/custom_arrays.xml
+++ b/res/values/custom_arrays.xml
@@ -96,4 +96,31 @@
         <item>#FF00FF00</item>
         <item>#FFFF0000</item>
     </string-array>
+
+    <string-array name="keys_action_entries" translatable="false">
+        <item>@string/keys_action_nothing</item>
+        <item>@string/keys_action_home</item>
+        <item>@string/keys_action_back</item>
+        <item>@string/keys_action_menu</item>
+        <item>@string/keys_action_app_switch</item>
+        <item>@string/keys_action_search</item>
+        <item>@string/keys_action_voice_search</item>
+        <item>@string/keys_action_in_app_search</item>
+        <item>@string/keys_action_last_app</item>
+        <item>@string/keys_action_kill_app</item>
+    </string-array>
+
+    <string-array name="keys_action_values" translatable="false">
+        <item>0</item>
+        <item>6</item>
+        <item>7</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>8</item>
+        <item>9</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 9f6e10b..1ed331b 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -162,6 +162,41 @@
     <string name="show_network_speed">Network speed indicator</string>
     <string name="show_network_speed_summary">Show network speed in statusbar</string>
 
+    <!-- Hardware keys -->
+    <string name="button_keys_title">Keys</string>
+    <string name="keys_bindings_title">Key actions</string>
+    <string name="button_keys_back_title" >Back key</string>
+    <string name="button_keys_home_title" >Home key</string>
+    <string name="button_keys_menu_title" >Menu key</string>
+    <string name="button_keys_assist_title" >Search key</string>
+    <string name="button_keys_appSwitch_title" >App switch key</string>
+    <string name="keys_enable_custom_title">Custom actions</string>
+    <string name="keys_back_press_title">Back key</string>
+    <string name="keys_back_long_press_title">Back key (long press)</string>
+    <string name="keys_home_press_title">Home key</string>
+    <string name="keys_home_long_press_title">Home key (long press)</string>
+    <string name="keys_home_double_tap_title">Home key (double tap)</string>
+    <string name="keys_menu_press_title">Menu key</string>
+    <string name="keys_menu_long_press_title">Menu key (long press)</string>
+    <string name="keys_assist_press_title">Search key</string>
+    <string name="keys_assist_long_press_title">Search key (long press)</string>
+    <string name="keys_app_switch_press_title">App switch key</string>
+    <string name="keys_app_switch_long_press_title">App switch key (long press)</string>
+    <string name="keys_action_nothing">No action</string>
+    <string name="keys_action_menu">Open/close menu</string>
+    <string name="keys_action_app_switch">Recent apps switcher</string>
+    <string name="keys_action_search">Search assistant</string>
+    <string name="keys_action_voice_search">Voice search</string>
+    <string name="keys_action_in_app_search">In-app search</string>
+    <string name="keys_action_home">Home button</string>
+    <string name="keys_action_back">Back button</string>
+    <string name="keys_action_last_app">Switch to last app</string>
+    <string name="keys_action_kill_app">Kill app</string>
+    <string name="keys_action_normal">Normal press</string>
+    <string name="keys_action_long">Long press</string>
+    <string name="keys_action_double">Double tap</string>
+    <string name="dialog_no_home_key_title">No home action</string>
+    <string name="no_home_key">You have no button assigned to the \"Home\" action! This can make your device unusable!</string>
 </resources>
 
 
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index e4569ab..c6fd472 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -14,6 +14,20 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
+<!-- Copyright (C) 2012 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
@@ -29,4 +43,140 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="button_keys"
+        android:title="@string/button_keys_title" >
+
+        <SwitchPreference
+            android:key="keys_enable_custom"
+            android:title="@string/keys_enable_custom_title"
+            android:defaultValue="false"
+            android:persistent="false" />
+    </PreferenceCategory>
+   
+    <PreferenceCategory
+       android:key="button_keys_back"
+        android:title="@string/button_keys_back_title" >
+
+        <ListPreference
+            android:key="keys_back_press"
+            android:dialogTitle="@string/keys_back_press_title"
+            android:title="@string/keys_action_normal"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+
+        <ListPreference
+            android:key="keys_back_long_press"
+            android:dialogTitle="@string/keys_back_long_press_title"
+            android:title="@string/keys_action_long"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="button_keys_home"
+        android:title="@string/button_keys_home_title">
+    
+        <ListPreference
+            android:key="keys_home_press"
+            android:dialogTitle="@string/keys_home_press_title"
+            android:title="@string/keys_action_normal"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+
+        <ListPreference
+            android:key="keys_home_long_press"
+            android:dialogTitle="@string/keys_home_long_press_title"
+            android:title="@string/keys_action_long"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+
+        <ListPreference
+            android:key="keys_home_double_tap"
+            android:dialogTitle="@string/keys_home_double_tap_title"
+            android:title="@string/keys_action_double"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="button_keys_menu"
+        android:title="@string/button_keys_menu_title">
+
+        <ListPreference
+            android:key="keys_menu_press"
+            android:dialogTitle="@string/keys_menu_press_title"
+            android:title="@string/keys_action_normal"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+
+        <ListPreference
+            android:key="keys_menu_long_press"
+            android:dialogTitle="@string/keys_menu_long_press_title"
+            android:title="@string/keys_action_long"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="button_keys_assist"
+        android:title="@string/button_keys_assist_title">        
+
+        <ListPreference
+            android:key="keys_assist_press"
+            android:dialogTitle="@string/keys_assist_press_title"
+            android:title="@string/keys_action_normal"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+
+        <ListPreference
+            android:key="keys_assist_long_press"
+            android:dialogTitle="@string/keys_assist_long_press_title"
+            android:title="@string/keys_action_long"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="button_keys_appSwitch"
+        android:title="@string/button_keys_appSwitch_title">        
+
+        <ListPreference
+            android:key="keys_app_switch_press"
+            android:dialogTitle="@string/keys_app_switch_press_title"
+            android:title="@string/keys_action_normal"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+
+        <ListPreference
+            android:key="keys_app_switch_long_press"
+            android:dialogTitle="@string/keys_app_switch_long_press_title"
+            android:title="@string/keys_action_long"
+            android:entries="@array/keys_action_entries"
+            android:entryValues="@array/keys_action_values"
+            android:persistent="false"
+            android:dependency="keys_enable_custom" />
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/src/org/omnirom/omnigears/ButtonSettings.java b/src/org/omnirom/omnigears/ButtonSettings.java
index d17c86d..e014f8a 100644
--- a/src/org/omnirom/omnigears/ButtonSettings.java
+++ b/src/org/omnirom/omnigears/ButtonSettings.java
@@ -15,7 +15,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+/*
+ * Copyright (C) 2013 The CyanogenMod project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.omnirom.omnigears;
 
 import android.content.ContentResolver;
@@ -23,19 +37,84 @@
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.preference.ListPreference;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 
-public class ButtonSettings extends SettingsPreferenceFragment {
+public class ButtonSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
 
     private static final String CATEGORY_VOLUME = "button_volume_keys";
+    private static final String CATEGORY_KEYS = "button_keys";
+    private static final String CATEGORY_BACK = "button_keys_back";
+    private static final String CATEGORY_HOME = "button_keys_home";
+    private static final String CATEGORY_MENU = "button_keys_menu";
+    private static final String CATEGORY_ASSIST = "button_keys_assist";
+    private static final String CATEGORY_APPSWITCH = "button_keys_appSwitch";
+    
     private static final String BUTTON_VOLUME_WAKE = "button_volume_wake_screen";
 
+    private static final String KEYS_CATEGORY_BINDINGS = "keys_bindings";
+    private static final String KEYS_ENABLE_CUSTOM = "keys_enable_custom";
+    private static final String KEYS_BACK_PRESS = "keys_back_press";
+    private static final String KEYS_BACK_LONG_PRESS = "keys_back_long_press";
+    private static final String KEYS_HOME_PRESS = "keys_home_press";
+    private static final String KEYS_HOME_LONG_PRESS = "keys_home_long_press";
+    private static final String KEYS_HOME_DOUBLE_TAP = "keys_home_double_tap";
+    private static final String KEYS_MENU_PRESS = "keys_menu_press";
+    private static final String KEYS_MENU_LONG_PRESS = "keys_menu_long_press";
+    private static final String KEYS_ASSIST_PRESS = "keys_assist_press";
+    private static final String KEYS_ASSIST_LONG_PRESS = "keys_assist_long_press";
+    private static final String KEYS_APP_SWITCH_PRESS = "keys_app_switch_press";
+    private static final String KEYS_APP_SWITCH_LONG_PRESS = "keys_app_switch_long_press";
+
+    // Available custom actions to perform on a key press.
+    private static final int ACTION_NOTHING = 0;
+    private static final int ACTION_MENU = 1;
+    private static final int ACTION_APP_SWITCH = 2;
+    private static final int ACTION_SEARCH = 3;
+    private static final int ACTION_VOICE_SEARCH = 4;
+    private static final int ACTION_IN_APP_SEARCH = 5;
+    private static final int ACTION_HOME = 6;
+    private static final int ACTION_BACK = 7;
+    private static final int ACTION_LAST_APP = 8;
+    private static final int ACTION_KILL_APP = 9;
+
+    // Masks for checking presence of hardware keys.
+    // Must match values in frameworks/base/core/res/res/values/config.xml
+    private static final int KEY_MASK_HOME = 0x01;
+    private static final int KEY_MASK_BACK = 0x02;
+    private static final int KEY_MASK_MENU = 0x04;
+    private static final int KEY_MASK_ASSIST = 0x08;
+    private static final int KEY_MASK_APP_SWITCH = 0x10;
+
     private CheckBoxPreference mVolumeWake;
+    private SwitchPreference mEnableCustomBindings;
+    private ListPreference mBackPressAction;
+    private ListPreference mBackLongPressAction;
+    private ListPreference mHomePressAction;
+    private ListPreference mHomeLongPressAction;
+    private ListPreference mHomeDoubleTapAction;
+    private ListPreference mMenuPressAction;
+    private ListPreference mMenuLongPressAction;
+    private ListPreference mAssistPressAction;
+    private ListPreference mAssistLongPressAction;
+    private ListPreference mAppSwitchPressAction;
+    private ListPreference mAppSwitchLongPressAction;
+    private Map<String, Integer> mKeySettings = new HashMap<String, Integer>();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -61,6 +140,206 @@
         } else {
             prefScreen.removePreference(volumeCategory);
         }
+
+        final int deviceKeys = getResources().getInteger(
+                com.android.internal.R.integer.config_deviceHardwareKeys);
+        final boolean hasBackKey = (deviceKeys & KEY_MASK_BACK) != 0;
+        final boolean hasHomeKey = (deviceKeys & KEY_MASK_HOME) != 0;
+        final boolean hasMenuKey = (deviceKeys & KEY_MASK_MENU) != 0;
+        final boolean hasAssistKey = (deviceKeys & KEY_MASK_ASSIST) != 0;
+        final boolean hasAppSwitchKey = (deviceKeys & KEY_MASK_APP_SWITCH) != 0;
+
+        final PreferenceCategory keysCategory =
+                (PreferenceCategory) prefScreen.findPreference(CATEGORY_KEYS);
+        final PreferenceCategory keysBackCategory =
+                (PreferenceCategory) prefScreen.findPreference(CATEGORY_BACK);
+        final PreferenceCategory keysHomeCategory =
+                (PreferenceCategory) prefScreen.findPreference(CATEGORY_HOME);
+        final PreferenceCategory keysMenuCategory =
+                (PreferenceCategory) prefScreen.findPreference(CATEGORY_MENU);
+        final PreferenceCategory keysAssistCategory =
+                (PreferenceCategory) prefScreen.findPreference(CATEGORY_ASSIST);
+        final PreferenceCategory keysAppSwitchCategory =
+                (PreferenceCategory) prefScreen.findPreference(CATEGORY_APPSWITCH);
+
+        if (!res.getBoolean(R.bool.config_has_hardware_buttons)) {
+            prefScreen.removePreference(keysCategory);
+            prefScreen.removePreference(keysBackCategory);
+            prefScreen.removePreference(keysHomeCategory);
+            prefScreen.removePreference(keysMenuCategory);
+            prefScreen.removePreference(keysAssistCategory);
+            prefScreen.removePreference(keysAppSwitchCategory);           
+        } else {
+            mEnableCustomBindings = (SwitchPreference) prefScreen.findPreference(
+                    KEYS_ENABLE_CUSTOM);
+            mBackPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_BACK_PRESS);
+            mBackLongPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_BACK_LONG_PRESS);
+            mHomePressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_HOME_PRESS);
+            mHomeLongPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_HOME_LONG_PRESS);
+            mHomeDoubleTapAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_HOME_DOUBLE_TAP);
+            mMenuPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_MENU_PRESS);
+            mMenuLongPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_MENU_LONG_PRESS);
+            mAssistPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_ASSIST_PRESS);
+            mAssistLongPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_ASSIST_LONG_PRESS);
+            mAppSwitchPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_APP_SWITCH_PRESS);
+            mAppSwitchLongPressAction = (ListPreference) prefScreen.findPreference(
+                    KEYS_APP_SWITCH_LONG_PRESS);
+
+            if (hasBackKey) {
+                int backPressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_BACK_ACTION, ACTION_BACK);
+
+                mBackPressAction.setValue(Integer.toString(backPressAction));
+                mBackPressAction.setSummary(mBackPressAction.getEntry());
+                mBackPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_BACK_ACTION, backPressAction);
+
+                int backLongPressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_BACK_LONG_PRESS_ACTION, ACTION_NOTHING);
+
+                mBackLongPressAction.setValue(Integer.toString(backLongPressAction));
+                mBackLongPressAction.setSummary(mBackLongPressAction.getEntry());
+                mBackLongPressAction.setOnPreferenceChangeListener(this);
+                
+                mKeySettings.put(Settings.System.KEY_BACK_LONG_PRESS_ACTION, backLongPressAction);
+            } else {
+                prefScreen.removePreference(keysBackCategory);
+            }
+
+            if (hasHomeKey) {
+                int homePressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_HOME_ACTION, ACTION_HOME);
+
+                mHomePressAction.setValue(Integer.toString(homePressAction));
+                mHomePressAction.setSummary(mHomePressAction.getEntry());
+                mHomePressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_HOME_ACTION, homePressAction);
+
+                int homeLongPressAction;
+                int longPressOnHomeBehavior = getResources().getInteger(
+                        com.android.internal.R.integer.config_longPressOnHomeBehavior);
+
+                if (longPressOnHomeBehavior == 1){
+                    longPressOnHomeBehavior = ACTION_APP_SWITCH;
+                } else if (longPressOnHomeBehavior == 2){
+                    longPressOnHomeBehavior = ACTION_SEARCH;
+                } else {
+                    longPressOnHomeBehavior = ACTION_NOTHING;
+                }
+
+                if (hasAppSwitchKey) {
+                    homeLongPressAction = Settings.System.getInt(getContentResolver(),
+                            Settings.System.KEY_HOME_LONG_PRESS_ACTION, ACTION_NOTHING);
+                } else {
+                    int defaultAction = ACTION_NOTHING;
+                    homeLongPressAction = Settings.System.getInt(getContentResolver(),
+                            Settings.System.KEY_HOME_LONG_PRESS_ACTION, longPressOnHomeBehavior);
+                }
+                mHomeLongPressAction.setValue(Integer.toString(homeLongPressAction));
+                mHomeLongPressAction.setSummary(mHomeLongPressAction.getEntry());
+                mHomeLongPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_HOME_LONG_PRESS_ACTION, homeLongPressAction);
+
+                int doubleTapOnHomeBehavior = getResources().getInteger(
+                        com.android.internal.R.integer.config_doubleTapOnHomeBehavior);
+
+                int homeDoubleTapAction = Settings.System.getInt(getContentResolver(),
+                            Settings.System.KEY_HOME_DOUBLE_TAP_ACTION,
+                            doubleTapOnHomeBehavior == 1 ? ACTION_APP_SWITCH : ACTION_NOTHING);
+
+                mHomeDoubleTapAction.setValue(Integer.toString(homeDoubleTapAction));
+                mHomeDoubleTapAction.setSummary(mHomeDoubleTapAction.getEntry());
+                mHomeDoubleTapAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_HOME_DOUBLE_TAP_ACTION, homeDoubleTapAction);
+            } else {
+                prefScreen.removePreference(keysHomeCategory);
+            }
+
+            if (hasMenuKey) {
+                int menuPressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_MENU_ACTION, ACTION_MENU);
+                mMenuPressAction.setValue(Integer.toString(menuPressAction));
+                mMenuPressAction.setSummary(mMenuPressAction.getEntry());
+                mMenuPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_MENU_ACTION, menuPressAction);
+        
+                int menuLongPressAction = ACTION_NOTHING;
+                if (!hasAssistKey) {
+                    menuLongPressAction = ACTION_SEARCH;
+                }
+
+                menuLongPressAction = Settings.System.getInt(getContentResolver(),
+                            Settings.System.KEY_MENU_LONG_PRESS_ACTION, menuLongPressAction);
+
+                mMenuLongPressAction.setValue(Integer.toString(menuLongPressAction));
+                mMenuLongPressAction.setSummary(mMenuLongPressAction.getEntry());
+                mMenuLongPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_MENU_LONG_PRESS_ACTION, menuLongPressAction);
+            } else {
+                prefScreen.removePreference(keysMenuCategory);
+            }
+
+            if (hasAssistKey) {
+                int assistPressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_ASSIST_ACTION, ACTION_SEARCH);
+                mAssistPressAction.setValue(Integer.toString(assistPressAction));
+                mAssistPressAction.setSummary(mAssistPressAction.getEntry());
+                mAssistPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_ASSIST_ACTION, assistPressAction);
+
+                int assistLongPressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_ASSIST_LONG_PRESS_ACTION, ACTION_VOICE_SEARCH);
+                mAssistLongPressAction.setValue(Integer.toString(assistLongPressAction));
+                mAssistLongPressAction.setSummary(mAssistLongPressAction.getEntry());
+                mAssistLongPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_ASSIST_LONG_PRESS_ACTION, assistLongPressAction);
+            } else {
+                prefScreen.removePreference(keysAssistCategory);
+            }
+
+            if (hasAppSwitchKey) {
+                int appSwitchPressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_APP_SWITCH_ACTION, ACTION_APP_SWITCH);
+                mAppSwitchPressAction.setValue(Integer.toString(appSwitchPressAction));
+                mAppSwitchPressAction.setSummary(mAppSwitchPressAction.getEntry());
+                mAppSwitchPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_APP_SWITCH_ACTION, appSwitchPressAction);
+
+                int appSwitchLongPressAction = Settings.System.getInt(getContentResolver(),
+                        Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, ACTION_NOTHING);
+                mAppSwitchLongPressAction.setValue(Integer.toString(appSwitchLongPressAction));
+                mAppSwitchLongPressAction.setSummary(mAppSwitchLongPressAction.getEntry());
+                mAppSwitchLongPressAction.setOnPreferenceChangeListener(this);
+
+                mKeySettings.put(Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, appSwitchLongPressAction);
+            } else {
+                prefScreen.removePreference(keysAppSwitchCategory);
+            }
+
+            mEnableCustomBindings.setChecked((Settings.System.getInt(getActivity().
+                    getApplicationContext().getContentResolver(),
+                    Settings.System.HARDWARE_KEY_REBINDING, 0) == 1));
+		    mEnableCustomBindings.setOnPreferenceChangeListener(this);
+        }
     }
 
     @Override
@@ -72,11 +351,157 @@
 
             return true;
         }
-
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mEnableCustomBindings) {
+            boolean value = (Boolean) newValue;
+            Settings.System.putInt(getContentResolver(), Settings.System.HARDWARE_KEY_REBINDING,
+                    value ? 1 : 0);
+            return true;
+        } else if (preference == mBackPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mBackPressAction.findIndexOfValue((String) newValue);
+            mBackPressAction.setSummary(
+                    mBackPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_BACK_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_BACK_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mBackLongPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mBackLongPressAction.findIndexOfValue((String) newValue);
+            mBackLongPressAction.setSummary(
+                    mBackLongPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_BACK_LONG_PRESS_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_BACK_LONG_PRESS_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mHomePressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mHomePressAction.findIndexOfValue((String) newValue);
+            mHomePressAction.setSummary(
+                    mHomePressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_HOME_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_HOME_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mHomeLongPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mHomeLongPressAction.findIndexOfValue((String) newValue);
+            mHomeLongPressAction.setSummary(
+                    mHomeLongPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_HOME_LONG_PRESS_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_HOME_LONG_PRESS_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mHomeDoubleTapAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mHomeDoubleTapAction.findIndexOfValue((String) newValue);
+            mHomeDoubleTapAction.setSummary(
+                    mHomeDoubleTapAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_HOME_DOUBLE_TAP_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_HOME_DOUBLE_TAP_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mMenuPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mMenuPressAction.findIndexOfValue((String) newValue);
+            mMenuPressAction.setSummary(
+                    mMenuPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_MENU_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_MENU_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mMenuLongPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mMenuLongPressAction.findIndexOfValue((String) newValue);
+            mMenuLongPressAction.setSummary(
+                    mMenuLongPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_MENU_LONG_PRESS_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_MENU_LONG_PRESS_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mAssistPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mAssistPressAction.findIndexOfValue((String) newValue);
+            mAssistPressAction.setSummary(
+                    mAssistPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_ASSIST_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_ASSIST_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mAssistLongPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mAssistLongPressAction.findIndexOfValue((String) newValue);
+            mAssistLongPressAction.setSummary(
+                    mAssistLongPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_ASSIST_LONG_PRESS_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_ASSIST_LONG_PRESS_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mAppSwitchPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mAppSwitchPressAction.findIndexOfValue((String) newValue);
+            mAppSwitchPressAction.setSummary(
+                    mAppSwitchPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_APP_SWITCH_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_APP_SWITCH_ACTION, value);
+            checkForHomeKey();
+            return true;
+        } else if (preference == mAppSwitchLongPressAction) {
+            int value = Integer.valueOf((String) newValue);
+            int index = mAppSwitchLongPressAction.findIndexOfValue((String) newValue);
+            mAppSwitchLongPressAction.setSummary(
+                    mAppSwitchLongPressAction.getEntries()[index]);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, value);
+            mKeySettings.put(Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, value);
+            checkForHomeKey();
+            return true;
+        }
+        return false;
+    }
+
     private boolean hasVolumeRocker() {
         return getActivity().getResources().getBoolean(R.bool.config_has_volume_rocker);
     }
+    
+    private boolean hasHomeKey() {
+        Iterator<Integer> nextAction = mKeySettings.values().iterator();
+        while (nextAction.hasNext()){
+            int action = nextAction.next();
+            if (action == ACTION_HOME){
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    private void checkForHomeKey(){
+        if (!hasHomeKey()){
+			AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
+			alertDialogBuilder.setTitle(R.string.dialog_no_home_key_title);
+			alertDialogBuilder
+				.setMessage(R.string.no_home_key)
+				.setCancelable(false)
+				.setPositiveButton(R.string.ok,new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog,int id) {
+					}
+				  });
+            AlertDialog alertDialog = alertDialogBuilder.create();
+            alertDialog.show();
+        }
+    }
 }