commit 1205d16e020beeb16f05e0d788fdf7ed478623f6
author John Spurlock <jspurlock@google.com> Thu Oct 04 09:09:14 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 04 09:09:15 2012 -0700
tree 02c0a484dca02bc818de9a297f87f4f945b09e53
parent 31fed73701041cd5455942abe2dacfc7639c5370
parent 078a490c2276c91ab84536d603c7848dc244e330

Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev

media/java/android/media/AudioService.java

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 61418fb..b334bb3 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -733,7 +733,7 @@
 
         if (streamType == STREAM_REMOTE_MUSIC) {
             // don't play sounds for remote
-            flags &= ~AudioManager.FLAG_PLAY_SOUND;
+            flags &= ~(AudioManager.FLAG_PLAY_SOUND|AudioManager.FLAG_FIXED_VOLUME);
             //if (DEBUG_VOL) Log.i(TAG, "Need to adjust remote volume: calling adjustRemoteVolume()");
             adjustRemoteVolume(AudioSystem.STREAM_MUSIC, direction, flags);
         } else {
@@ -771,6 +771,7 @@
         int index;
         int oldIndex;
 
+        flags &= ~AudioManager.FLAG_FIXED_VOLUME;
         if ((streamTypeAlias == AudioSystem.STREAM_MUSIC) &&
                ((device & mFixedVolumeDevices) != 0)) {
             flags |= AudioManager.FLAG_FIXED_VOLUME;
@@ -855,6 +856,7 @@
         final int device = getDeviceForStream(streamType);
         int oldIndex;
 
+        flags &= ~AudioManager.FLAG_FIXED_VOLUME;
         if ((mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC) &&
                 ((device & mFixedVolumeDevices) != 0)) {
             flags |= AudioManager.FLAG_FIXED_VOLUME;

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index a12af8d..160f3b4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -339,7 +339,9 @@
         mNotificationPanelIsFullScreenWidth =
             (mNotificationPanel.getLayoutParams().width == ViewGroup.LayoutParams.MATCH_PARENT);
         mNotificationPanel.setSystemUiVisibility(
-                  View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER | View.STATUS_BAR_DISABLE_NOTIFICATION_ICONS);
+                  View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER |
+                  View.STATUS_BAR_DISABLE_NOTIFICATION_ICONS |
+                  View.STATUS_BAR_DISABLE_CLOCK);
 
         if (!ActivityManager.isHighEndGfx()) {
             mStatusBarWindow.setBackground(null);