summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author jackqdyulei <jackqdyulei@google.com> 2019-02-27 10:43:57 -0800
committer jackqdyulei <jackqdyulei@google.com> 2019-02-27 13:24:37 -0800
commit8c360174f5dfc63185a8756d7ac4068f3d8c46a8 (patch)
tree2d3b3df7b0dc04d8b620c07fd03ba78c8651b4e5
parent2d7de480a4f635bec420e51ca42cf0c3b2dfa569 (diff)
Update MediaSessions to add some methods
Also move drawable to settingslib Bug: 126199571 Test: Build Change-Id: I20d06c179b7cd67ef97cde1d04e26a120ffdd4ae
-rw-r--r--data/etc/com.android.settings.xml1
-rw-r--r--packages/SettingsLib/res/drawable/ic_volume_remote.xml (renamed from packages/SystemUI/res/drawable/ic_volume_remote.xml)0
-rw-r--r--packages/SettingsLib/res/drawable/ic_volume_remote_mute.xml (renamed from packages/SystemUI/res/drawable/ic_volume_remote_mute.xml)0
3 files changed, 1 insertions, 0 deletions
diff --git a/data/etc/com.android.settings.xml b/data/etc/com.android.settings.xml
index 2110a8fa7e3d..3e53a3838543 100644
--- a/data/etc/com.android.settings.xml
+++ b/data/etc/com.android.settings.xml
@@ -33,6 +33,7 @@
<permission name="android.permission.MANAGE_USERS"/>
<permission name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
<permission name="android.permission.MASTER_CLEAR"/>
+ <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
<permission name="android.permission.MODIFY_PHONE_STATE"/>
<permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<permission name="android.permission.MOVE_PACKAGE"/>
diff --git a/packages/SystemUI/res/drawable/ic_volume_remote.xml b/packages/SettingsLib/res/drawable/ic_volume_remote.xml
index fe396d9cc496..fe396d9cc496 100644
--- a/packages/SystemUI/res/drawable/ic_volume_remote.xml
+++ b/packages/SettingsLib/res/drawable/ic_volume_remote.xml
diff --git a/packages/SystemUI/res/drawable/ic_volume_remote_mute.xml b/packages/SettingsLib/res/drawable/ic_volume_remote_mute.xml
index 2e0512244ddf..2e0512244ddf 100644
--- a/packages/SystemUI/res/drawable/ic_volume_remote_mute.xml
+++ b/packages/SettingsLib/res/drawable/ic_volume_remote_mute.xml