From 97eff878a45f4e828812fa5a4745e3477209df1f Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 8 Sep 2015 13:41:45 -0400 Subject: Selectively show zen footer. Only show zen footer if the active stream is affected by the current zen mode. Bug: 23844466 Change-Id: I08770882f12f11c3458e1e48a287139480ae7aa3 (cherry picked from commit 6aa83b4ca0859c3f59413ef092f8d843f8646f0e) --- packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages/SystemUI') diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 7836411..e9f1095 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -104,6 +104,7 @@ public class VolumeDialog { private final SpTexts mSpTexts; private final SparseBooleanArray mDynamic = new SparseBooleanArray(); private final KeyguardManager mKeyguard; + private final AudioManager mAudioManager; private final int mExpandButtonAnimationDuration; private final ZenFooter mZenFooter; private final LayoutTransition mLayoutTransition; @@ -135,6 +136,7 @@ public class VolumeDialog { mCallback = callback; mSpTexts = new SpTexts(mContext); mKeyguard = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); + mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); mDialog = new CustomDialog(mContext); @@ -636,7 +638,8 @@ public class VolumeDialog { private void updateFooterH() { if (D.BUG) Log.d(TAG, "updateFooterH"); final boolean wasVisible = mZenFooter.getVisibility() == View.VISIBLE; - final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF; + final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF + && mAudioManager.isStreamAffectedByRingerMode(mActiveStream); if (wasVisible != visible && !visible) { prepareForCollapse(); } -- cgit v1.1