diff options
| -rw-r--r-- | res/xml/button_settings.xml | 16 | ||||
| -rw-r--r-- | src/com/android/settings/ButtonSettings.java | 11 |
2 files changed, 24 insertions, 3 deletions
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml index 284cd93..1584e98 100644 --- a/res/xml/button_settings.xml +++ b/res/xml/button_settings.xml @@ -93,7 +93,7 @@ <com.android.settings.cyanogenmod.SystemSettingSwitchPreference android:key="back_wake_screen" android:title="@string/button_wake_title" - android:defaultValue="true" /> + android:defaultValue="false" /> </PreferenceCategory> @@ -104,7 +104,7 @@ <com.android.settings.cyanogenmod.SystemSettingSwitchPreference android:key="menu_wake_screen" android:title="@string/button_wake_title" - android:defaultValue="true" /> + android:defaultValue="false" /> <ListPreference android:key="hardware_keys_menu_press" @@ -128,6 +128,11 @@ android:key="assist_key" android:title="@string/hardware_keys_assist_key_title" > + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="assist_wake_screen" + android:title="@string/button_wake_title" + android:defaultValue="false" /> + <ListPreference android:key="hardware_keys_assist_press" android:dialogTitle="@string/hardware_keys_short_press_title" @@ -150,6 +155,11 @@ android:key="app_switch_key" android:title="@string/hardware_keys_appswitch_key_title" > + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="app_switch_wake_screen" + android:title="@string/button_wake_title" + android:defaultValue="false" /> + <ListPreference android:key="hardware_keys_app_switch_press" android:dialogTitle="@string/hardware_keys_short_press_title" @@ -175,7 +185,7 @@ <com.android.settings.cyanogenmod.SystemSettingSwitchPreference android:key="volume_wake_screen" android:title="@string/button_wake_title" - android:defaultValue="true" /> + android:defaultValue="false" /> <com.android.settings.cyanogenmod.SystemSettingSwitchPreference android:key="volbtn_music_controls" diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java index e3fe839..b98efd6 100644 --- a/src/com/android/settings/ButtonSettings.java +++ b/src/com/android/settings/ButtonSettings.java @@ -145,6 +145,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements final boolean showHomeWake = (deviceWakeKeys & KEY_MASK_HOME) != 0; final boolean showBackWake = (deviceWakeKeys & KEY_MASK_BACK) != 0; final boolean showMenuWake = (deviceWakeKeys & KEY_MASK_MENU) != 0; + final boolean showAssistWake = (deviceWakeKeys & KEY_MASK_ASSIST) != 0; + final boolean showAppSwitchWake = (deviceWakeKeys & KEY_MASK_APP_SWITCH) != 0; final boolean showVolumeWake = (deviceWakeKeys & KEY_MASK_VOLUME) != 0; boolean hasAnyBindableKey = false; @@ -279,6 +281,10 @@ public class ButtonSettings extends SettingsPreferenceFragment implements } if (hasAssistKey) { + if (!showAssistWake) { + assistCategory.removePreference(findPreference(Settings.System.ASSIST_WAKE_SCREEN)); + } + int pressAction = Settings.System.getInt(resolver, Settings.System.KEY_ASSIST_ACTION, ACTION_SEARCH); mAssistPressAction = initActionList(KEY_ASSIST_PRESS, pressAction); @@ -293,6 +299,11 @@ public class ButtonSettings extends SettingsPreferenceFragment implements } if (hasAppSwitchKey) { + if (!showAppSwitchWake) { + appSwitchCategory.removePreference(findPreference( + Settings.System.APP_SWITCH_WAKE_SCREEN)); + } + int pressAction = Settings.System.getInt(resolver, Settings.System.KEY_APP_SWITCH_ACTION, ACTION_APP_SWITCH); mAppSwitchPressAction = initActionList(KEY_APP_SWITCH_PRESS, pressAction); |