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

Commit 33903da4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't change stream volume on mute"

parents bfd1f0c2 0d73bc24

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -396,13 +396,9 @@ public class VolumeDialogImpl implements VolumeDialog { 
                if (hasVibrator) {

                if (hasVibrator) {

                    mController.setRingerMode(AudioManager.RINGER_MODE_VIBRATE, false);

                    mController.setRingerMode(AudioManager.RINGER_MODE_VIBRATE, false);

                } else {

                } else {

                    final boolean wasZero = ss.level == 0;

                    mController.setStreamVolume(AudioManager.STREAM_RING, wasZero ? 1 : 0);

                    mController.setRingerMode(AudioManager.RINGER_MODE_SILENT, false);

                    mController.setRingerMode(AudioManager.RINGER_MODE_SILENT, false);

                }

                }

            } else if (mState.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {

            } else if (mState.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {

                final boolean wasZero = ss.level == 0;

                mController.setStreamVolume(AudioManager.STREAM_RING, wasZero ? 1 : 0);

                mController.setRingerMode(AudioManager.RINGER_MODE_SILENT, false);

                mController.setRingerMode(AudioManager.RINGER_MODE_SILENT, false);

            } else {

            } else {

                mController.setRingerMode(AudioManager.RINGER_MODE_NORMAL, false);

                mController.setRingerMode(AudioManager.RINGER_MODE_NORMAL, false);