diff options
| author | DvTonder <david.vantonder@gmail.com> | 2013-04-03 17:19:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-03 17:19:31 -0700 |
| commit | 95be1ae5146d68522a488f9b93e3f64bdaa7c8b8 (patch) | |
| tree | 5d38b16bb2a00070edc540cacebb0639196c8b9c /res/xml | |
| parent | 155f59263b628226c85b582cc82b552597286ea4 (diff) | |
| parent | 477eb478a0b1ca4af2d05026ec3bcda0874cc286 (diff) | |
| download | packages_apps_settings-95be1ae5146d68522a488f9b93e3f64bdaa7c8b8.zip packages_apps_settings-95be1ae5146d68522a488f9b93e3f64bdaa7c8b8.tar.gz packages_apps_settings-95be1ae5146d68522a488f9b93e3f64bdaa7c8b8.tar.bz2 | |
Merge "Settings: Separate Expanded desktop from Power menu settings" into cm-10.1
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/power_menu_settings.xml | 9 | ||||
| -rw-r--r-- | res/xml/system_settings.xml | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/res/xml/power_menu_settings.xml b/res/xml/power_menu_settings.xml index e5fae43..dfc448d 100644 --- a/res/xml/power_menu_settings.xml +++ b/res/xml/power_menu_settings.xml @@ -29,15 +29,8 @@ android:title="@string/power_menu_screenshot_title" android:defaultValue="false" /> - <ListPreference - android:key="power_menu_expanded_desktop" - android:title="@string/power_menu_expanded_desktop" - android:entries="@array/expanded_desktop_entries" - android:entryValues="@array/expanded_desktop_values" - android:persistent="false" /> - <CheckBoxPreference - android:key="power_menu_expanded_desktop_no_navbar" + android:key="power_menu_expanded_desktop" android:title="@string/power_menu_expanded_desktop" android:persistent="false" /> diff --git a/res/xml/system_settings.xml b/res/xml/system_settings.xml index feebf21..c5ffb5d 100644 --- a/res/xml/system_settings.xml +++ b/res/xml/system_settings.xml @@ -34,6 +34,18 @@ android:fragment="com.android.settings.cyanogenmod.PowerWidget" android:title="@string/notification_drawer_title" /> + <ListPreference + android:key="expanded_desktop" + android:title="@string/power_menu_expanded_desktop" + android:entries="@array/expanded_desktop_entries" + android:entryValues="@array/expanded_desktop_values" + android:persistent="false" /> + + <CheckBoxPreference + android:key="expanded_desktop_no_navbar" + android:title="@string/power_menu_expanded_desktop" + android:persistent="false" /> + <PreferenceScreen android:key="power_menu" android:title="@string/power_menu_title" |