summaryrefslogtreecommitdiff
path: root/core/java/android/preference/VolumePreference.java
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-05-14 14:09:43 -0700
committerEric Laurent <elaurent@google.com>2012-05-14 14:13:10 -0700
commit8c78752f2bf786ca3e6f45b9dc6955d3b4bba59c (patch)
tree4f0a7b7b2928897f452c4357c4ce53b98e4b7d18 /core/java/android/preference/VolumePreference.java
parent2411c3361eb2c15b09a8bfadf5c7c4a3de092ea0 (diff)
Implement new volume display policy.
Whenever a stream type is muted, the progress bar in volume panel is at 0. If a stream is muted by ringer mode and does not control ringer mode, the progress bar is disabled. Pressing VOL- when in vibrate or silent mode resets the last audible volume of ringtone stream (music strem on tablets) to 0. VolumePanel implementation: - Always prefer AudioManager APIs over AudioService APIs when available on both. - Do not use AudioManager.shouldVibrate() (deprecated). Change-Id: I57fcb19ada4e8d729b6b41d668496562ebe340c3
Diffstat (limited to 'core/java/android/preference/VolumePreference.java')
-rw-r--r--core/java/android/preference/VolumePreference.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/preference/VolumePreference.java b/core/java/android/preference/VolumePreference.java
index fe5e76ca4d96..caf55d70226e 100644
--- a/core/java/android/preference/VolumePreference.java
+++ b/core/java/android/preference/VolumePreference.java
@@ -239,9 +239,7 @@ public class VolumePreference extends SeekBarDialogPreference implements
public void onChange(boolean selfChange) {
super.onChange(selfChange);
if (mSeekBar != null && mAudioManager != null) {
- int volume = mAudioManager.isStreamMute(mStreamType) ?
- mAudioManager.getLastAudibleStreamVolume(mStreamType)
- : mAudioManager.getStreamVolume(mStreamType);
+ int volume = mAudioManager.getStreamVolume(mStreamType);
mSeekBar.setProgress(volume);
}
}