summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-04-03 03:03:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-03 03:03:46 +0000
commitad80b437f9d41815a5e865d47a26e8c4c56d5251 (patch)
treec6c228cefd3b8603e83a665e1813b0242e6740f2 /packages/SystemUI/src/com/android/systemui/statusbar
parentf8515ea431e4171bce058944f05edd03497ad07b (diff)
parent4f1163c83e79da52b2be7ff6b10163441895bc26 (diff)
downloadframeworks_base-ad80b437f9d41815a5e865d47a26e8c4c56d5251.zip
frameworks_base-ad80b437f9d41815a5e865d47a26e8c4c56d5251.tar.gz
frameworks_base-ad80b437f9d41815a5e865d47a26e8c4c56d5251.tar.bz2
Merge "Zen: Add a new level: alarms-only."
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
index 1938c6d..ac93ced 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
@@ -218,7 +218,7 @@ public class PhoneStatusBarPolicy {
volumeVisible = true;
volumeIconId = R.drawable.stat_sys_ringer_silent;
volumeDescription = mContext.getString(R.string.accessibility_ringer_silent);
- } else if (mZen != Global.ZEN_MODE_NO_INTERRUPTIONS &&
+ } else if (mZen != Global.ZEN_MODE_NO_INTERRUPTIONS && mZen != Global.ZEN_MODE_ALARMS &&
audioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_VIBRATE) {
volumeVisible = true;
volumeIconId = R.drawable.stat_sys_ringer_vibrate;