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

Commit b747ef87 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Update the ringer mode when adjusting ring volume. Related to "Don't... 

Merge "Update the ringer mode when adjusting ring volume.  Related to "Don't lock out volume dialog in silent mode" under packages/apps/Settings." into gingerbread
parents 78efe391 b5907dd5

core/java/android/preference/VolumePreference.java

+15 −1
Original line number Diff line number Diff line
@@ -312,7 +312,21 @@ public class VolumePreference extends SeekBarPreference implements 
        }

        

        public void run() {

            mAudioManager.setStreamVolume(mStreamType, mLastProgress, 0);

            int newStreamVolume = mLastProgress;

            if (mStreamType == AudioManager.STREAM_RING) {

                int ringerMode = mAudioManager.getRingerMode();

                int vibrateSetting = mAudioManager.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER);



                if (mLastProgress == 0) {

                    if (ringerMode == AudioManager.RINGER_MODE_NORMAL) {

                        mAudioManager.setRingerMode(vibrateSetting==AudioManager.VIBRATE_SETTING_OFF?AudioManager.RINGER_MODE_SILENT:AudioManager.RINGER_MODE_VIBRATE);

                    }

                } else if (ringerMode != AudioManager.RINGER_MODE_NORMAL) {

                    mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);

                }



            }

            mAudioManager.setStreamVolume(mStreamType, newStreamVolume, 0);

        }

        

        private void sample() {