From a93d126f0ded329b7ae325769674127d444259f5 Mon Sep 17 00:00:00 2001 From: Beverly Date: Thu, 25 Jan 2018 09:58:30 -0500 Subject: [PATCH] QS dnd icon is always the same dnd icon No more total silence dnd icon even if app puts phone into total silence mode it'll show the same dnd icon Test: manual Bug: 72494029 Change-Id: I5807345b74ac166858ec0ad8931e6996d39ee543 --- .../src/com/android/systemui/qs/tiles/DndTile.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index eb2e519fb560e..aaf6ef52d7612 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -76,9 +76,6 @@ public class DndTile extends QSTileImpl { private static final String ACTION_SET_VISIBLE = "com.android.systemui.dndtile.SET_VISIBLE"; private static final String EXTRA_VISIBLE = "visible"; - private static final QSTile.Icon TOTAL_SILENCE = - ResourceIcon.get(R.drawable.ic_qs_dnd_on_total_silence); - private final ZenModeController mController; private final DndDetailAdapter mDetailAdapter; @@ -201,25 +198,22 @@ public class DndTile extends QSTileImpl { state.slash.isSlashed = !state.value; state.label = getTileLabel(); state.secondaryLabel = getSecondaryLabel(zen != Global.ZEN_MODE_OFF); + state.icon = ResourceIcon.get(R.drawable.ic_qs_dnd_on); checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_ADJUST_VOLUME); switch (zen) { case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS: - state.icon = ResourceIcon.get(R.drawable.ic_qs_dnd_on); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_dnd_priority_on); break; case Global.ZEN_MODE_NO_INTERRUPTIONS: - state.icon = TOTAL_SILENCE; state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_dnd_none_on); break; case ZEN_MODE_ALARMS: - state.icon = ResourceIcon.get(R.drawable.ic_qs_dnd_on); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_dnd_alarms_on); break; default: - state.icon = ResourceIcon.get(R.drawable.ic_qs_dnd_on); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_dnd); break;