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

Commit c3409dd2 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev

parents a1b647c8 bc7233a8

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

+4 −0
Original line number Diff line number Diff line
@@ -768,6 +768,7 @@ public class VolumeDialogController { 
            filter.addAction(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED);

            filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);

            filter.addAction(Intent.ACTION_SCREEN_OFF);

            filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

            mContext.registerReceiver(this, filter, null, mWorker);

        }
@@ -822,6 +823,9 @@ public class VolumeDialogController { 
            } else if (action.equals(Intent.ACTION_SCREEN_OFF)) {

                if (D.BUG) Log.d(TAG, "onReceive ACTION_SCREEN_OFF");

                mCallbacks.onScreenOff();

            } else if (action.equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) {

                if (D.BUG) Log.d(TAG, "onReceive ACTION_CLOSE_SYSTEM_DIALOGS");

                dismiss();

            }

            if (changed) {

                mCallbacks.onStateChanged(mState);