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

Commit 31f30262 authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

Revert "Selectively show zen footer." 

While playing music, if zen mode is on, the user must exit it via the
quick settings tile or via the settings menu, even if they used the
volume buttons to enter the state. We shouldn't have such a restriction.

Ticket: CYNGNOS-2662

This reverts commit 97eff878.

Change-Id: I305d94e5b187db6fa01e5453bcdadbd1687cf43f
parent f5b69f33

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

+1 −4
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 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;
@@ -139,7 +138,6 @@ 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);
@@ -666,8 +664,7 @@ 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

                && mAudioManager.isStreamAffectedByRingerMode(mActiveStream);

        final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF;

        if (wasVisible != visible && !visible) {

            prepareForCollapse();

        }