Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Zen: Show subhead for Indefinitely." into lmp-dev

Browse Source
This commit is contained in:
John Spurlock
2014-08-06 14:38:02 +00:00
committed by Android (Google) Code Review
parent e87457f105 89fe1cb9de
commit 72d19f4671
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
View File

@@ -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);