PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev

Browse Source
This commit is contained in:
Michael Wright
2014-07-17 21:59:07 +00:00
committed by Android (Google) Code Review
parent eb0628bb02 bdf28e4025
commit b8a90e5042
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/arrays.xml
View File

@@ -641,10 +641,12 @@
<item>alarm volume</item> <item>alarm volume</item>
<item>notification volume</item> <item>notification volume</item>
<item>bluetooth volume</item> <item>bluetooth volume</item>
<item>mute/unmute microphone</item>
<item>keep awake</item> <item>keep awake</item>
<item>monitor location</item> <item>monitor location</item>
<item>monitor high power location</item> <item>monitor high power location</item>
<item>get usage stats</item>
<item>mute/unmute microphone</item>
<item>project media</item>
</string-array> </string-array>
<!-- User display names for app ops codes --> <!-- User display names for app ops codes -->
@@ -689,10 +691,12 @@
<item>Alarm volume</item> <item>Alarm volume</item>
<item>Notification volume</item> <item>Notification volume</item>
<item>Bluetooth volume</item> <item>Bluetooth volume</item>
<item>Mute/unmute microphone</item>
<item>Keep awake</item> <item>Keep awake</item>
<item>Location</item> <item>Location</item>
<item>Location</item> <item>Location</item>
<item>Get usage stats</item>
<item>Mute/unmute microphone</item>
<item>Project media</item>
</string-array> </string-array>
<!-- Titles for the list of long press timeout options. --> <!-- Titles for the list of long press timeout options. -->

10
src/com/android/settings/applications/AppOpsState.java
View File

@@ -103,14 +103,14 @@ public class AppOpsState {
AppOpsManager.OP_WIFI_SCAN, AppOpsManager.OP_WIFI_SCAN,
AppOpsManager.OP_NEIGHBORING_CELLS, AppOpsManager.OP_NEIGHBORING_CELLS,
AppOpsManager.OP_MONITOR_LOCATION, AppOpsManager.OP_MONITOR_LOCATION,
AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION}, AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION },
new boolean[] { true, new boolean[] { true,
true, true,
false, false,
false, false,
false, false,
false, false,
false} false }
); );
public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate( public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate(
@@ -189,13 +189,15 @@ public class AppOpsState {
AppOpsManager.OP_CALL_PHONE, AppOpsManager.OP_CALL_PHONE,
AppOpsManager.OP_WRITE_SETTINGS, AppOpsManager.OP_WRITE_SETTINGS,
AppOpsManager.OP_SYSTEM_ALERT_WINDOW, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
AppOpsManager.OP_WAKE_LOCK }, AppOpsManager.OP_WAKE_LOCK,
AppOpsManager.OP_PROJECT_MEDIA },
new boolean[] { false, new boolean[] { false,
true, true,
true, true,
true, true,
true, true,
true, } true,
false, }
); );
public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] { public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {