Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '37185d90a2036ece55991f416fcf7948a2198d97':
  DO NOT MERGE Hide the volume panel for watches for now
This commit is contained in:
Justin Koh
2014-10-01 18:00:45 +00:00
committed by Android Git Automerger
parent d1ba4c13d0 37185d90a2
commit bf6f081cda
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioService.java
View File

@@ -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) {