summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorDvTonder <david.vantonder@gmail.com>2013-04-02 22:27:45 -0400
committerDanny Baumann <dannybaumann@web.de>2013-04-03 15:23:05 +0200
commit477eb478a0b1ca4af2d05026ec3bcda0874cc286 (patch)
treef29dd07ed67edb711fb757666d3fa1e468a32cbf /res/xml
parenta3ec5167fa9ba4da25e3053012bc157abf0e44c0 (diff)
downloadpackages_apps_settings-477eb478a0b1ca4af2d05026ec3bcda0874cc286.zip
packages_apps_settings-477eb478a0b1ca4af2d05026ec3bcda0874cc286.tar.gz
packages_apps_settings-477eb478a0b1ca4af2d05026ec3bcda0874cc286.tar.bz2
Settings: Separate Expanded desktop from Power menu settings
This commit separates the ability to configure the Expanded desktop mode from the ability to enable the switch in the Power menu. This will allow for the ED Tile to be hidden if the feature is disabled and the power menu entry to be removed if the user chooses to use the Tile instead. Change-Id: I3d2eabde8087d25940cbb1e5262086b9c6e291f1
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/power_menu_settings.xml9
-rw-r--r--res/xml/system_settings.xml12
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"