Merge "Update DndCondition settings summary" into pi-dev am: 9fc72be6c8

am: 3153a0e540

Change-Id: I551283fe04d4df1d2dd492c91ec7589e0f94aa12
This commit is contained in:
Beverly Tai
2018-04-09 13:18:48 -07:00
committed by android-build-merger
3 changed files with 15 additions and 3 deletions

View File

@@ -138,7 +138,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
if (zenMode != Settings.Global.ZEN_MODE_OFF) {
ZenModeConfig config = NotificationManager.from(mContext).getZenModeConfig();
String description = ZenModeConfig.getDescription(mContext, true, config);
String description = ZenModeConfig.getDescription(mContext, true, config, false);
if (description == null) {
return mContext.getString(R.string.zen_mode_sound_summary_on);