Merge "Update Settings UI to add new microphone app ops."

This commit is contained in:
Emily Bernier
2014-06-24 21:02:16 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 1 deletions

View File

@@ -625,6 +625,7 @@
<item>alarm volume</item>
<item>notification volume</item>
<item>bluetooth volume</item>
<item>mute/unmute microphone</item>
<item>keep awake</item>
<item>monitor location</item>
<item>monitor high power location</item>
@@ -672,6 +673,7 @@
<item>Alarm volume</item>
<item>Notification volume</item>
<item>Bluetooth volume</item>
<item>Mute/unmute microphone</item>
<item>Keep awake</item>
<item>Location</item>
<item>Location</item>

View File

@@ -166,7 +166,8 @@ public class AppOpsState {
AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
AppOpsManager.OP_AUDIO_ALARM_VOLUME,
AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME, },
AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME,
AppOpsManager.OP_MUTE_MICROPHONE},
new boolean[] { false,
true,
true,