diff options
| author | Eric Laurent <elaurent@google.com> | 2012-09-24 14:26:30 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 10:28:05 -0700 |
| commit | 4bbcc6549738f3d69831b2bd9eb4accec3e9920e (patch) | |
| tree | 7986713ccd162e22f055088965653fa4ddde11eb /core/java | |
| parent | 3b772c6b6754aede43cbc849b89e91b399d6828d (diff) | |
| download | frameworks_base-4bbcc6549738f3d69831b2bd9eb4accec3e9920e.zip frameworks_base-4bbcc6549738f3d69831b2bd9eb4accec3e9920e.tar.gz frameworks_base-4bbcc6549738f3d69831b2bd9eb4accec3e9920e.tar.bz2 | |
Display a fixed volume silder when docked.
Align UI indication to volume policy when docked: the music volume
cannot be adjusted when docked or connected to HDMI. Display
a disabled slider at max volume in this case to be consistent.
Bug 4335692.
Change-Id: I6f8db143b0e2ecf54e4bdacd88afdeb661a98a18
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/VolumePanel.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java index 8315bd7..d7c7f46 100644 --- a/core/java/android/view/VolumePanel.java +++ b/core/java/android/view/VolumePanel.java @@ -699,9 +699,12 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie if (sc.seekbarView.getMax() != max) { sc.seekbarView.setMax(max); } + sc.seekbarView.setProgress(index); - if (streamType != mAudioManager.getMasterStreamType() - && streamType != AudioService.STREAM_REMOTE_MUSIC && isMuted(streamType)) { + if (((flags & AudioManager.FLAG_FIXED_VOLUME) != 0) || + (streamType != mAudioManager.getMasterStreamType() && + streamType != AudioService.STREAM_REMOTE_MUSIC && + isMuted(streamType))) { sc.seekbarView.setEnabled(false); } else { sc.seekbarView.setEnabled(true); |