summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-05-29 10:17:51 -0400
committerJohn Spurlock <jspurlock@google.com>2014-05-29 10:19:14 -0400
commitf71205c1ee3b34801f98af275a281f7d06c50b51 (patch)
treedfaa1a9ab76a54b2a462f81259f47a3e6a60081b /packages
parent2684d5e7d7f0b698c631f27b099760fae33e84ba (diff)
downloadframeworks_base-f71205c1ee3b34801f98af275a281f7d06c50b51.zip
frameworks_base-f71205c1ee3b34801f98af275a281f7d06c50b51.tar.gz
frameworks_base-f71205c1ee3b34801f98af275a281f7d06c50b51.tar.bz2
VolumeZen: Don't clear stream type if embedded.
Clearing the stream type makes sense if the volume panel is in dialog mode, but not when embedded. Bug:15186070 Change-Id: Ice5f547ef987e28ef51050faef682c5dfa5f7604
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
index 06f4c2e..67f3a3d 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -1035,8 +1035,8 @@ public class VolumePanel extends Handler {
if (isShowing()) {
if (mDialog != null) {
mDialog.dismiss();
+ mActiveStreamType = -1;
}
- mActiveStreamType = -1;
}
synchronized (sConfirmSafeVolumeLock) {
if (sConfirmSafeVolumeDialog != null) {