PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent dd3db23f18 3153a0e540
commit 890283719a
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/dashboard/conditional/DndCondition.java
View File

@@ -42,9 +42,10 @@ public class DndCondition extends Condition {
@VisibleForTesting
static final IntentFilter DND_FILTER =
new IntentFilter(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED_INTERNAL);
@VisibleForTesting
protected ZenModeConfig mConfig;
private int mZen;
private ZenModeConfig mConfig;
private final Receiver mReceiver;
public DndCondition(ConditionManager manager) {
@@ -93,7 +94,7 @@ public class DndCondition extends Condition {
@Override
public CharSequence getSummary() {
return ZenModeConfig.getDescription(mManager.getContext(), mZen != Global.ZEN_MODE_OFF,
mConfig);
mConfig, true);
}
@Override

2
src/com/android/settings/notification/ZenModeSettings.java
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);