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

This commit is contained in:
Julia Reynolds
2016-01-05 20:47:20 +00:00
committed by Android (Google) Code Review

View File

@@ -648,7 +648,7 @@ public class VolumeDialog {
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();
}