commit 1a3d9ba7ccedf097c7b35c67d3295ded360185e7
author Julia Reynolds <juliacr@google.com> Tue Jan 05 20:47:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 05 20:47:20 2016 +0000
tree 233d1cf48e65b14233bc07b301ff99ef4c119f30
parent ed150013e31c0245a7b676f4d5a2f7a1a6ee9e7a
parent a45869a0b68fdac4d6c20eee67415b377b6325e5

Merge "Show 'end now' in expanded volume panel."

packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
index 9d4ec10..3c63aae 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -648,7 +648,7 @@
         if (D.BUG) Log.d(TAG, "updateFooterH");
         final boolean wasVisible = mZenFooter.getVisibility() == View.VISIBLE;
         final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF
-                && mAudioManager.isStreamAffectedByRingerMode(mActiveStream);
+                && (mAudioManager.isStreamAffectedByRingerMode(mActiveStream) || mExpanded);
         if (wasVisible != visible && !visible) {
             prepareForCollapse();
         }