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

Commit afe01177 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 54a6d07c: Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev 

* commit '54a6d07c818c34f7361a45e1a79e5cfe2d876edd':
  Volume: force-dismiss panel when the screen turns off.
parents aae32cfd 747a6996

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

+7 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ public class VolumePanel extends Handler { 
        final boolean masterVolumeKeySounds = res.getBoolean(R.bool.config_useVolumeKeySounds);

        mPlayMasterStreamTones = masterVolumeOnly && masterVolumeKeySounds;



        listenToRingerMode();

        registerReceiver();

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
@@ -441,9 +441,10 @@ public class VolumePanel extends Handler { 
        updateStates();

    }



    private void listenToRingerMode() {

    private void registerReceiver() {

        final IntentFilter filter = new IntentFilter();

        filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        filter.addAction(Intent.ACTION_SCREEN_OFF);

        mContext.registerReceiver(new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {
@@ -453,6 +454,10 @@ public class VolumePanel extends Handler { 
                    removeMessages(MSG_RINGER_MODE_CHANGED);

                    sendMessage(obtainMessage(MSG_RINGER_MODE_CHANGED));

                }



                if (Intent.ACTION_SCREEN_OFF.equals(action)) {

                    postDismiss(0);

                }

            }

        }, filter);

    }