Settings: Move priority configuration to its own sub-settings page.

Bug: 20064962
Change-Id: Idd03e0e5077e13cc08ff9997ab9ad56ddcdb5c50

3 files changed, 86 insertions, 47 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 734cf7d..307f3b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5678,7 +5678,10 @@
     <string name="notification_volume_option_title">Notification volume</string>
 
     <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_settings_title">Interruptions</string>
+    <string name="zen_mode_settings_title">Block interruptions</string>
+
+    <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_priority_settings_title">Priority only allows</string>
 
     <!-- Sound & notification > Sound section: Title for the zen mode option. [CHAR LIMIT=60] -->
     <string name="zen_mode_option_title">When calls and notifications arrive</string>
@@ -5866,9 +5869,6 @@
     <!-- [CHAR LIMIT=30] Zen mode settings: Exit condition selection dialog, default option -->
     <string name="zen_mode_default_option">Until you turn this off</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Important category text -->
-    <string name="zen_mode_important_category">Priority interruptions</string>
-
     <!-- [CHAR LIMIT=60] Zen mode settings: Downtime category text -->
     <string name="zen_mode_downtime_category">Downtime</string>
 
@@ -5917,11 +5917,14 @@
     <!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
     <string name="zen_mode_from_starred">Starred contacts only</string>
 
-    <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
-    <string name="zen_mode_events">Events and reminders</string>
+    <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+    <string name="zen_mode_alarms">Alarms</string>
 
-    <!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
-    <string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
+    <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+    <string name="zen_mode_reminders">Reminders</string>
+
+    <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+    <string name="zen_mode_events">Events</string>
 
     <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
     <string name="zen_mode_when">Automatically turn on</string>
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
new file mode 100644
index 0000000..e8bab66
--- /dev/null
+++ b/res/xml/zen_mode_priority_settings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="zen_mode_settings"
+    android:title="@string/zen_mode_priority_settings_title" >
+
+    <!-- Alarms -->
+    <SwitchPreference
+        android:key="alarms"
+        android:title="@string/zen_mode_alarms"
+        android:enabled="false"
+        android:defaultValue="true"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Reminders -->
+    <SwitchPreference
+        android:key="reminders"
+        android:title="@string/zen_mode_reminders"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Events -->
+    <SwitchPreference
+        android:key="events"
+        android:title="@string/zen_mode_events"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Messages -->
+    <SwitchPreference
+        android:key="messages"
+        android:title="@string/zen_mode_messages"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Calls -->
+    <SwitchPreference
+        android:key="calls"
+        android:title="@string/zen_mode_calls"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Messages/calls from -->
+    <com.android.settings.DropDownPreference
+            android:key="starred"
+            android:title="@string/zen_mode_from"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 3ac4eef..7c8dc7a 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -25,45 +25,11 @@
             android:title="@string/zen_mode_option_title"
             android:persistent="false" />
 
-    <PreferenceCategory
-        android:key="important"
-        android:title="@string/zen_mode_important_category" >
-
-        <SwitchPreference
-            android:key="events"
-            android:title="@string/zen_mode_events"
-            android:persistent="false"
-            android:switchTextOff=""
-            android:switchTextOn="" />
-
-        <SwitchPreference
-            android:key="calls"
-            android:title="@string/zen_mode_calls"
-            android:persistent="false"
-            android:switchTextOff=""
-            android:switchTextOn="" />
-
-        <SwitchPreference
-            android:key="messages"
-            android:title="@string/zen_mode_messages"
-            android:persistent="false"
-            android:switchTextOff=""
-            android:switchTextOn="" />
-
-        <com.android.settings.DropDownPreference
-                android:key="starred"
-                android:title="@string/zen_mode_from"
-                android:persistent="false" />
-
-        <Preference
-            android:key="alarm_info"
-            android:title=""
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/colorForegroundInverse"
-            android:selectable="false"
-            android:summary="@string/zen_mode_alarm_info" />
-
-    </PreferenceCategory>
+    <!-- Priority only allows -->
+    <PreferenceScreen
+            android:key="priority_settings"
+            android:title="@string/zen_mode_priority_settings_title"
+            android:fragment="com.android.settings.notification.ZenModePrioritySettings" />
 
     <!-- Downtime -->
     <PreferenceCategory