commit cefa4395598d2eb0d299175934d9a13a4396f574
author John Spurlock <jspurlock@google.com> Fri Apr 03 03:03:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 03 03:03:51 2015 +0000
tree 10d6925318238081731bff1b16787df04fec2c8d
parent abbe2d4c8a7d4801bb1ffa7487bfb07b19ccae7e
parent b5bbff8c97d1d6526d36b479c0f8ee6b26e4e4ad

Merge "Settings: Support new alarms-only zen value."

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3eaf38d..734cf7d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5689,6 +5689,9 @@
     <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
     <string name="zen_mode_option_important_interruptions">Allow only priority interruptions</string>
 
+    <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+    <string name="zen_mode_option_alarms">Allow only alarms</string>
+
     <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
     <string name="zen_mode_option_no_interruptions">Don\'t interrupt</string>
 

src/com/android/settings/notification/ZenModeSettings.java

diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index c2e143a..93e5c4a 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -88,12 +88,14 @@
 
     private static final SettingPrefWithCallback PREF_ZEN_MODE = new SettingPrefWithCallback(
             SettingPref.TYPE_GLOBAL, KEY_ZEN_MODE, Global.ZEN_MODE, Global.ZEN_MODE_OFF,
-            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, Global.ZEN_MODE_ALARMS,
             Global.ZEN_MODE_NO_INTERRUPTIONS) {
         protected String getCaption(Resources res, int value) {
             switch (value) {
                 case Global.ZEN_MODE_NO_INTERRUPTIONS:
                     return res.getString(R.string.zen_mode_option_no_interruptions);
+                case Global.ZEN_MODE_ALARMS:
+                    return res.getString(R.string.zen_mode_option_alarms);
                 case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
                     return res.getString(R.string.zen_mode_option_important_interruptions);
                 default: