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

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

am 6cb493b3: Volume: Confirm unsafe media volume dialog on VOL_UP. 

* commit '6cb493b3fd2947b35aa5f98a20c8831df67a3e35':
  Volume: Confirm unsafe media volume dialog on VOL_UP.
parents 5fd224ae 2d28d6e1

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

+21 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ import android.provider.Settings.Global; 
import android.util.Log;

import android.util.Log;

import android.util.SparseArray;

import android.util.SparseArray;

import android.view.Gravity;

import android.view.Gravity;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.View;

import android.view.View;
@@ -249,6 +250,8 @@ public class VolumePanel extends Handler { 
        private final VolumePanel mVolumePanel;

        private final VolumePanel mVolumePanel;

        private final AudioManager mAudioManager;

        private final AudioManager mAudioManager;





        private boolean mNewVolumeUp;



        SafetyWarning(Context context, VolumePanel volumePanel, AudioManager audioManager) {

        SafetyWarning(Context context, VolumePanel volumePanel, AudioManager audioManager) {

            super(context);

            super(context);

            mContext = context;

            mContext = context;
@@ -266,6 +269,24 @@ public class VolumePanel extends Handler { 
            context.registerReceiver(mReceiver, filter);

            context.registerReceiver(mReceiver, filter);

        }

        }





        @Override

        public boolean onKeyDown(int keyCode, KeyEvent event) {

            if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && event.getRepeatCount() == 0) {

                mNewVolumeUp = true;

            }

            return super.onKeyDown(keyCode, event);

        }



        @Override

        public boolean onKeyUp(int keyCode, KeyEvent event) {

            if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && mNewVolumeUp) {

                if (LOGD) Log.d(TAG, "Confirmed warning via VOLUME_UP");

                mAudioManager.disableSafeMediaVolume();

                dismiss();

            }

            return super.onKeyUp(keyCode, event);

        }



        @Override

        @Override

        public void onClick(DialogInterface dialog, int which) {

        public void onClick(DialogInterface dialog, int which) {

            mAudioManager.disableSafeMediaVolume();

            mAudioManager.disableSafeMediaVolume();