Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97eff878 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

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 6aa83b4c)
parent b7e722b8

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

+4 −1
Original line number Diff line number Diff line
@@ -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();

        }