diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/cm_strings.xml | 6 | ||||
| -rwxr-xr-x | res/values/config.xml | 7 | ||||
| -rw-r--r-- | res/xml/button_settings.xml | 34 |
3 files changed, 29 insertions, 18 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 0a11c3d..fa5a9b2 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -314,6 +314,7 @@ <string name="button_pref_title">Buttons</string> <string name="hardware_keys_power_key_title">Power button</string> <string name="hardware_keys_home_key_title">Home button</string> + <string name="hardware_keys_back_key_title">Back button</string> <string name="hardware_keys_menu_key_title">Menu button</string> <string name="hardware_keys_appswitch_key_title">Recents button</string> <string name="hardware_keys_volume_keys_title">Volume buttons</string> @@ -335,12 +336,9 @@ <string name="volbtn_cursor_control_on_reverse">Volume up/down moves cursor right/left</string> <string name="power_end_call_title">End call</string> <string name="power_end_call_summary">Pressing the power button will end the current call</string> - <string name="button_wake_title">Wake up</string> - <string name="home_wake_summary">Pressing the home button will wake your device</string> + <string name="button_wake_title">Wake up device</string> <string name="home_answer_call_title">Answer call</string> <string name="home_answer_call_summary">Pressing the home button will answer the current incoming call</string> - <string name="volbtn_wake_device_title">Wake up device</string> - <string name="volbtn_wake_device_summary">Pressing either volume button will wake your device</string> <!-- Buttons - Enable navbar --> <string name="disable_navkeys_title">Enable on-screen nav bar</string> diff --git a/res/values/config.xml b/res/values/config.xml index 35eb41b..62e7e67 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -22,10 +22,6 @@ <string name="additional_system_update" translatable="false"></string> <string name="additional_system_update_menu" translatable="false"></string> - <!-- Home button Wake Support. Some devices do not support this. - Setting to false will disable Home button Wake support --> - <bool name="config_show_homeWake">false</bool> - <!-- TODO: This is purely enforced by the interface, and does not affect what strings may be inserted into the actual content provider. With the addition of shortcuts, it seems more likely that users will @@ -47,7 +43,4 @@ <!-- Config to enable/disable ppp number in APN editor --> <bool name="config_ppp_enabled">false</bool> - - <!-- Volume rocker support. Some devices do not have a volume rocker. --> - <bool name="has_volume_rocker">true</bool> </resources> diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml index 716710c..9a7752d 100644 --- a/res/xml/button_settings.xml +++ b/res/xml/button_settings.xml @@ -42,7 +42,6 @@ <com.android.settings.cyanogenmod.SystemSettingSwitchPreference android:key="home_wake_screen" android:title="@string/button_wake_title" - android:summary="@string/home_wake_summary" android:defaultValue="true" /> <SwitchPreference @@ -70,9 +69,25 @@ </PreferenceCategory> <PreferenceCategory + android:key="back_key" + android:title="@string/hardware_keys_back_key_title" > + + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="back_wake_screen" + android:title="@string/button_wake_title" + android:defaultValue="true" /> + + </PreferenceCategory> + + <PreferenceCategory android:key="menu_key" android:title="@string/hardware_keys_menu_key_title" > + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="menu_wake_screen" + android:title="@string/button_wake_title" + android:defaultValue="true" /> + <ListPreference android:key="hardware_keys_menu_press" android:dialogTitle="@string/hardware_keys_short_press_title" @@ -117,6 +132,17 @@ android:key="volume_keys" android:title="@string/hardware_keys_volume_keys_title" > + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="volume_wake_screen" + android:title="@string/button_wake_title" + android:defaultValue="true" /> + + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="volbtn_music_controls" + android:title="@string/volbtn_music_controls_title" + android:summary="@string/volbtn_music_controls_summary" + android:defaultValue="true" /> + <ListPreference android:key="volume_key_cursor_control" android:dialogTitle="@string/volbtn_cursor_control_title" @@ -125,12 +151,6 @@ android:entryValues="@array/volbtn_cursor_control_values" android:persistent="false" /> - <SwitchPreference - android:key="volume_key_wake_device" - android:title="@string/volbtn_wake_device_title" - android:summary="@string/volbtn_wake_device_summary" - android:defaultValue="false" /> - </PreferenceCategory> </PreferenceScreen> |