From 89fe1cb9debbfd629f1467b2a3d957e6dc1a8507 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 6 Aug 2014 10:30:42 -0400 Subject: [PATCH] Zen: Show subhead for Indefinitely. Bug:16824870 Change-Id: Ic10d68df39c5afe06503d3b37a960c9319f84056 --- .../src/com/android/systemui/volume/ZenModePanel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index 191f9933dc585..0d837c79b54c6 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -284,14 +284,12 @@ public class ZenModePanel extends LinearLayout { final boolean zenOff = zen == Global.ZEN_MODE_OFF; final boolean zenImportant = zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; final boolean zenNone = zen == Global.ZEN_MODE_NO_INTERRUPTIONS; - final boolean foreverSelected = mExitConditionId == null; final boolean hasNextAlarm = mNextAlarm != 0; final boolean expanded = !mHidden && mExpanded; final boolean showAlarmWarning = zenNone && expanded && hasNextAlarm; mZenButtons.setVisibility(mHidden ? GONE : VISIBLE); - mZenSubhead.setVisibility(!mHidden && !zenOff && (expanded || !foreverSelected) ? VISIBLE - : GONE); + mZenSubhead.setVisibility(!mHidden && !zenOff ? VISIBLE : GONE); mZenSubheadExpanded.setVisibility(expanded ? VISIBLE : GONE); mZenSubheadCollapsed.setVisibility(!expanded ? VISIBLE : GONE); mMoreSettings.setVisibility(zenImportant && expanded ? VISIBLE : GONE);