diff options
| author | Eric Laurent <elaurent@google.com> | 2012-05-14 16:30:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 16:30:47 -0700 |
| commit | dfae6db0228a2ba4e34deb48d54fb06a2637e6a2 (patch) | |
| tree | 5429a27aae37c79eb437ab397fc12ac72927a8e5 /core/java/android/preference/VolumePreference.java | |
| parent | 05dde913f97b29751572ed8169f6ba20374c7036 (diff) | |
| parent | 8c78752f2bf786ca3e6f45b9dc6955d3b4bba59c (diff) | |
Merge "Implement new volume display policy." into jb-dev
Diffstat (limited to 'core/java/android/preference/VolumePreference.java')
| -rw-r--r-- | core/java/android/preference/VolumePreference.java | 4 |
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); } } |