From: Mill Chen <millchen@google.com>
Date: Mon, 15 Apr 2019 17:26:20 +0000 (-0700)
Subject: Add subtitle for Do not disturb
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce6137e247b3faee58adf388f21402560b8f0a2d;p=android-x86%2Fpackages-apps-Settings.git

Add subtitle for Do not disturb

Bug: 130364160
Test: visual
Change-Id: I85507b6b269d427501f144f56ca7dc871269e6d4
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1567c7559f..a11da2a5e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7424,6 +7424,9 @@
     <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
     <string name="zen_mode_settings_title">Do Not Disturb</string>
 
+    <!-- Subtitle for the Do not Disturb slice. [CHAR LIMIT=50]-->
+    <string name="zen_mode_slice_subtitle">Limit interruptions</string>
+
     <!-- Do not disturb: Title for the Do not Disturb dialog to turn on Do not disturb. [CHAR LIMIT=50]-->
     <string name="zen_mode_settings_turn_on_dialog_title">Turn on Do Not Disturb</string>
 
diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java
index e8b181a6e6..53e4ed397d 100644
--- a/src/com/android/settings/notification/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java
@@ -73,6 +73,7 @@ public class ZenModeSliceBuilder {
     public static Slice getSlice(Context context) {
         final boolean isZenModeEnabled = isZenModeEnabled(context);
         final CharSequence title = context.getText(R.string.zen_mode_settings_title);
+        final CharSequence subtitle = context.getText(R.string.zen_mode_slice_subtitle);
         @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
         final PendingIntent toggleAction = getBroadcastIntent(context);
         final PendingIntent primaryAction = getPrimaryAction(context);
@@ -86,6 +87,7 @@ public class ZenModeSliceBuilder {
                 .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(title)
+                        .setSubtitle(subtitle)
                         .addEndItem(toggleSliceAction)
                         .setPrimaryAction(primarySliceAction))
                 .build();