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

Commit 660d1038 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Always show or hide volume dialog" into pi-dev 

am: 3c20a18e

Change-Id: Id7fafcefdf9b9081c895237b3ed20c9bf6fefaec
parents 99852e4a 3c20a18e

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

+0 −2
Original line number Diff line number Diff line
@@ -518,7 +518,6 @@ public class VolumeDialogImpl implements VolumeDialog { 
        mHandler.removeMessages(H.SHOW);

        mHandler.removeMessages(H.DISMISS);

        rescheduleTimeoutH();

        if (mShowing) return;

        mShowing = true;



        initSettingsH();
@@ -546,7 +545,6 @@ public class VolumeDialogImpl implements VolumeDialog { 
    protected void dismissH(int reason) {

        mHandler.removeMessages(H.DISMISS);

        mHandler.removeMessages(H.SHOW);

        if (!mShowing) return;

        mDialogView.animate().cancel();

        mShowing = false;