diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-10 18:37:45 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-07-10 18:37:45 -0400 |
| commit | 86d04fdaa1853cf7ff8ec9aba1dd925dd098167e (patch) | |
| tree | 1834cfcf49c672e28e715a7005091c619a8a1bc8 /packages/SystemUI/src/com/android/systemui/volume | |
| parent | c09a04da297ff85b97aa6ec0a457e9292b8bf7fa (diff) | |
| download | frameworks_base-86d04fdaa1853cf7ff8ec9aba1dd925dd098167e.zip frameworks_base-86d04fdaa1853cf7ff8ec9aba1dd925dd098167e.tar.gz frameworks_base-86d04fdaa1853cf7ff8ec9aba1dd925dd098167e.tar.bz2 | |
Volume: Promote alarm warning to title.
Bug:16211556
Change-Id: I839e08d1ba26ba825a9799f92c9b600feb91a81b
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index b9d07d5..3614cde 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -85,7 +85,6 @@ public class ZenModePanel extends LinearLayout { private TextView mZenSubheadExpanded; private View mMoreSettings; private LinearLayout mZenConditions; - private View mAlarmWarning; private Callback mCallback; private ZenModeController mController; @@ -152,8 +151,6 @@ public class ZenModePanel extends LinearLayout { }); mZenConditions = (LinearLayout) findViewById(R.id.zen_conditions); - - mAlarmWarning = findViewById(R.id.zen_alarm_warning); } @Override @@ -279,10 +276,9 @@ public class ZenModePanel extends LinearLayout { mZenSubheadCollapsed.setVisibility(!mExpanded ? VISIBLE : GONE); mMoreSettings.setVisibility(zenImportant && mExpanded ? VISIBLE : GONE); mZenConditions.setVisibility(!zenOff && mExpanded ? VISIBLE : GONE); - mAlarmWarning.setVisibility(zenNone && mExpanded ? VISIBLE : GONE); if (zenNone) { - mZenSubheadExpanded.setText(R.string.zen_no_interruptions); + mZenSubheadExpanded.setText(R.string.zen_no_interruptions_with_warning); mZenSubheadCollapsed.setText(mExitConditionText); } else if (zenImportant) { mZenSubheadExpanded.setText(R.string.zen_important_interruptions); |