commit df01cde11c272b8e979044769641c8e17d67bf67
author Julia Reynolds <juliacr@google.com> Fri Dec 18 11:44:43 2015 -0500
committer Julia Reynolds <juliacr@google.com> Fri Dec 18 15:50:05 2015 -0500
tree 0cbbd8184f2b2052c88985254e88563eafa9b566
parent 63196c5f8211334486ab8e152eede72fbe6cfd6b

Conditionally show settings.

Change-Id: I8e62ed6e2515b76de73d3d25adcfb121f809c646

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ab180d..9d2f1f0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5699,7 +5699,26 @@
     <!-- Sound & notification > Notification section: Title for the option managing notifications per topic. [CHAR LIMIT=30] -->
     <string name="topic_notifications_title">Topic notifications</string>
 
+    <!-- [CHAR LIMIT=100] Notification topic list header -->
+    <string name="notification_topic_categories">Categories</string>
 
+    <!-- [CHAR LIMIT=100] Notification importance slider title -->
+    <string name="notification_importance_title">Importance</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
+    <string name="notification_importance_blocked">Blocked: Never show these notifications</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance slider: low importance level description -->
+    <string name="notification_importance_low">Low: Silently show at the bottom of the notification list</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance slider: normal importance level description -->
+    <string name="notification_importance_default">Normal: Silently show these notifications</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance slider: high importance level description -->
+    <string name="notification_importance_high">High: Show at the top of the notifications list and make sound</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
+    <string name="notification_importance_max">Urgent: Peek onto the screen and make sound</string>
 
     <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
     <string name="manage_notification_access_title">Notification access</string>

res/xml/app_notification_settings.xml

diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 6e27a07..5f00caf 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -30,7 +30,12 @@
     <Preference
             android:key="app_settings"
             android:title="@string/app_notification_preferences"
-            android:order="5"
+            android:order="2"
             android:persistent="false" />
 
+    <PreferenceCategory
+            android:key="categories"
+            android:title="@string/notification_topic_categories"
+            android:order="3" />
+
 </PreferenceScreen>

res/xml/topic_notification_settings.xml

diff --git a/res/xml/topic_notification_settings.xml b/res/xml/topic_notification_settings.xml
index 174c273..d5f28b3 100644
--- a/res/xml/topic_notification_settings.xml
+++ b/res/xml/topic_notification_settings.xml
@@ -21,7 +21,7 @@
     <!-- Importance -->
     <com.android.settings.notification.ImportanceSeekBarPreference
             android:key="importance"
-            android:title="@string/app_notification_importance_title"
+            android:title="@string/notification_importance_title"
             android:order="1"
             android:persistent="false" />