summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/notification_drawer.xml (renamed from res/xml/power_widget_settings.xml)24
-rw-r--r--res/xml/system_settings.xml2
2 files changed, 17 insertions, 9 deletions
diff --git a/res/xml/power_widget_settings.xml b/res/xml/notification_drawer.xml
index 7b464d3..6b6d689 100644
--- a/res/xml/power_widget_settings.xml
+++ b/res/xml/notification_drawer.xml
@@ -17,6 +17,19 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Notification drawer behaviour -->
+ <PreferenceCategory
+ android:title="@string/notification_drawer_behaviour_title">
+
+ <ListPreference
+ android:key="notification_drawer_collapse_on_dismiss"
+ android:title="@string/notification_drawer_collapse_on_dismiss_title"
+ android:dialogTitle="@string/notification_drawer_collapse_on_dismiss_title"
+ android:entries="@array/notification_drawer_collapse_on_dismiss_entries"
+ android:entryValues="@array/notification_drawer_collapse_on_dismiss_values" />
+
+ </PreferenceCategory>
+
<!-- Notification drawer Power Widget -->
<PreferenceCategory
android:title="@string/power_widget_title">
@@ -31,7 +44,7 @@
android:title="@string/title_widget_picker"
android:summary="@string/summary_widget_picker"
android:dependency="expanded_widget"
- android:fragment="com.android.settings.cyanogenmod.PowerWidget$PowerWidgetChooser">
+ android:fragment="com.android.settings.cyanogenmod.NotificationDrawer$PowerWidgetChooser">
</PreferenceScreen>
<PreferenceScreen
@@ -39,14 +52,9 @@
android:title="@string/title_widget_order"
android:summary="@string/summary_widget_order"
android:dependency="expanded_widget"
- android:fragment="com.android.settings.cyanogenmod.PowerWidget$PowerWidgetOrder">
+ android:fragment="com.android.settings.cyanogenmod.NotificationDrawer$PowerWidgetOrder">
</PreferenceScreen>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/power_widget_behavior">
-
<CheckBoxPreference
android:key="expanded_hide_onchange"
android:title="@string/title_expanded_hide_onchange"
@@ -69,4 +77,4 @@
</PreferenceCategory>
-</PreferenceScreen> \ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/system_settings.xml b/res/xml/system_settings.xml
index c5ffb5d..995cff2 100644
--- a/res/xml/system_settings.xml
+++ b/res/xml/system_settings.xml
@@ -31,7 +31,7 @@
<PreferenceScreen
android:key="notification_drawer"
- android:fragment="com.android.settings.cyanogenmod.PowerWidget"
+ android:fragment="com.android.settings.cyanogenmod.NotificationDrawer"
android:title="@string/notification_drawer_title" />
<ListPreference