summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/volume
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2015-02-06 15:33:53 -0800
committerRoboErik <epastern@google.com>2015-02-09 12:54:19 -0800
commit5452e258441edd77f6d608eea208ea60ce7ec262 (patch)
treefe09b3c98cb18e0fa12cec0ae4ae674bbc621f46 /packages/SystemUI/src/com/android/systemui/volume
parent3775a3f8861304073c2b2079f0b9a315a58c1d1a (diff)
downloadframeworks_base-5452e258441edd77f6d608eea208ea60ce7ec262.zip
frameworks_base-5452e258441edd77f6d608eea208ea60ce7ec262.tar.gz
frameworks_base-5452e258441edd77f6d608eea208ea60ce7ec262.tar.bz2
Delay unmuting on volume down
This allows the user to turn the volume down before a stream is unmuted by delaying the unmute call while volume down requests are still being made. bug:19297183 Change-Id: I65a8e489eb4cbfeace4f539103ee0025584102da
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
index acdcfc1..19a631a 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -602,7 +602,7 @@ public class VolumePanel extends Handler implements DemoMode {
private int getStreamVolume(int streamType) {
if (streamType == STREAM_MASTER) {
- return mAudioManager.getMasterVolume();
+ return mAudioManager.getLastAudibleMasterVolume();
} else if (streamType == STREAM_REMOTE_MUSIC) {
if (mStreamControls != null) {
StreamControl sc = mStreamControls.get(streamType);
@@ -613,7 +613,7 @@ public class VolumePanel extends Handler implements DemoMode {
}
return -1;
} else {
- return mAudioManager.getStreamVolume(streamType);
+ return mAudioManager.getLastAudibleStreamVolume(streamType);
}
}