diff options
| author | Eric Laurent <elaurent@google.com> | 2012-05-14 16:30:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 16:30:41 -0700 |
| commit | 106368400d4798e14daf3c32100bc87c35a480b0 (patch) | |
| tree | 2a74dccbea8c0ddea8e8f7b695fdf0916660fbfa | |
| parent | 1cbd519ebc8f9c93563a796fa404492678388b31 (diff) | |
| parent | 9d078e984e5b73c499050dff3443622a4b595524 (diff) | |
| download | packages_apps_Settings-106368400d4798e14daf3c32100bc87c35a480b0.zip packages_apps_Settings-106368400d4798e14daf3c32100bc87c35a480b0.tar.gz packages_apps_Settings-106368400d4798e14daf3c32100bc87c35a480b0.tar.bz2 | |
Merge "Implement new volume display policy." into jb-dev
| -rw-r--r-- | src/com/android/settings/RingerVolumePreference.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java index c80cd35..a79f4a5 100644 --- a/src/com/android/settings/RingerVolumePreference.java +++ b/src/com/android/settings/RingerVolumePreference.java @@ -116,8 +116,8 @@ public class RingerVolumePreference extends VolumePreference { boolean muted = mAudioManager.isStreamMute(streamType); if (mCheckBoxes[i] != null) { - if (streamType == AudioManager.STREAM_RING && muted - && !(mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT)) { + if ((streamType == AudioManager.STREAM_RING) && + (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) { mCheckBoxes[i].setImageResource( com.android.internal.R.drawable.ic_audio_ring_notif_vibrate); } else { @@ -126,9 +126,13 @@ public class RingerVolumePreference extends VolumePreference { } } if (mSeekBars[i] != null) { - final int volume = muted ? mAudioManager.getLastAudibleStreamVolume(streamType) - : mAudioManager.getStreamVolume(streamType); + final int volume = mAudioManager.getStreamVolume(streamType); mSeekBars[i].setProgress(volume); + if (streamType != mAudioManager.getMasterStreamType() && muted) { + mSeekBars[i].setEnabled(false); + } else { + mSeekBars[i].setEnabled(true); + } } } } @@ -169,9 +173,6 @@ public class RingerVolumePreference extends VolumePreference { } } - final int silentableStreams = System.getInt(getContext().getContentResolver(), - System.MODE_RINGER_STREAMS_AFFECTED, - ((1 << AudioSystem.STREAM_NOTIFICATION) | (1 << AudioSystem.STREAM_RING))); // Register callbacks for mute/unmute buttons for (int i = 0; i < mCheckBoxes.length; i++) { ImageView checkbox = (ImageView) view.findViewById(CHECKBOX_VIEW_ID[i]); |