Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev

2014-10-01 17:57:58 +00:00
parent ae3bd63bc5 0beee08646
commit 37185d90a2
1 changed files with 6 additions and 0 deletions
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1165,6 +1165,12 @@ public class AudioService extends IAudioService.Stub {
            streamType = AudioSystem.STREAM_NOTIFICATION;
        }

+        // Don't show the volume panel for watches yet.
+        if ((mContext.getResources().getConfiguration().uiMode & Configuration.UI_MODE_TYPE_WATCH)
+                == Configuration.UI_MODE_TYPE_WATCH) {
+            flags &= ~AudioManager.FLAG_SHOW_UI;
+        }
+
        mVolumePanel.postVolumeChanged(streamType, flags);

        if ((flags & AudioManager.FLAG_FIXED_VOLUME) == 0) {