diff options
| author | DvTonder <david.vantonder@gmail.com> | 2012-12-14 07:23:25 -0500 |
|---|---|---|
| committer | DvTonder <david.vantonder@gmail.com> | 2012-12-14 07:54:48 -0500 |
| commit | 57a8fb52eca6bda33d167d378374c98d9415e66c (patch) | |
| tree | 8c47cdc41a1d036cbdb2779242dd077b43e88857 /res | |
| parent | eccdbc296700ad8d8fc014e72cbccb5827ace1e2 (diff) | |
| download | packages_apps_settings-57a8fb52eca6bda33d167d378374c98d9415e66c.zip packages_apps_settings-57a8fb52eca6bda33d167d378374c98d9415e66c.tar.gz packages_apps_settings-57a8fb52eca6bda33d167d378374c98d9415e66c.tar.bz2 | |
Settings: Add Quick pulldown support for Quick Settings panel config
Change-Id: Ia54fa85466f47ad5952b18e9316fb5133334463b
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/power_widget_settings.xml | 6 | ||||
| -rw-r--r-- | res/xml/quick_settings_panel_settings.xml | 18 |
3 files changed, 20 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 07de5f1..be672e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4905,8 +4905,6 @@ <string name="cm_sound_mode_soundVibrate">Sound + Vibrate</string> <string name="pref_flash_mode_title">Flash mode</string> <string name="expanded_haptic_feedback_title">Haptic feedback</string> - <string name="power_widget_note_title">Note</string> - <string name="power_widget_note_summary">Enabling the Power widget will disable the ability to open the Quick Settings panel with a single swipe</string> <!-- Kill app long-press back --> <string name="kill_app_longpress_back">Kill app back button</string> @@ -5031,6 +5029,10 @@ <string name="title_dynamic_ime">IME changer</string> <string name="title_dynamic_wifi">Wi-Fi display</string> + <string name="title_general">General</string> + <string name="title_quick_pulldown">Quick pulldown</string> + <string name="summary_quick_pulldown">Show Quick Settings when pulling down notification bar near the right side of the screen</string> + <!-- This exists as part of Power widget already, re-use them If Power widget is removed, re-enable these <string name="pref_ring_mode_title">Sound modes</string> diff --git a/res/xml/power_widget_settings.xml b/res/xml/power_widget_settings.xml index d8abcd8..7b464d3 100644 --- a/res/xml/power_widget_settings.xml +++ b/res/xml/power_widget_settings.xml @@ -21,12 +21,6 @@ <PreferenceCategory android:title="@string/power_widget_title"> - <Preference - style="?android:preferenceInformationStyle" - android:title="@string/power_widget_note_title" - android:summary="@string/power_widget_note_summary" - android:selectable="false" /> - <CheckBoxPreference android:key="expanded_widget" android:title="@string/title_expanded_widget" diff --git a/res/xml/quick_settings_panel_settings.xml b/res/xml/quick_settings_panel_settings.xml index ddd0a0b..ab216ff 100644 --- a/res/xml/quick_settings_panel_settings.xml +++ b/res/xml/quick_settings_panel_settings.xml @@ -19,8 +19,20 @@ android:title="@string/quick_settings_title"> <PreferenceCategory + android:key="pref_general_settings" + android:title="@string/title_general" > + + <CheckBoxPreference + android:key="quick_pulldown" + android:title="@string/title_quick_pulldown" + android:summary="@string/summary_quick_pulldown" + android:persistent="false" /> + + </PreferenceCategory> + + <PreferenceCategory android:key="static_tiles" - android:title="@string/title_static_tiles"> + android:title="@string/title_static_tiles" > <PreferenceScreen android:key="tile_picker" @@ -41,7 +53,7 @@ <PreferenceCategory android:key="pref_dynamic_tiles" - android:title="@string/title_dynamic_tiles" /> + android:title="@string/title_dynamic_tiles" > <Preference style="?android:preferenceInformationStyle" @@ -69,4 +81,6 @@ android:title="@string/title_dynamic_wifi" android:persistent="false" /> + </PreferenceCategory> + </PreferenceScreen> |