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

Merge "Add wake lock app ops to UI."

Browse Source
This commit is contained in:
Dianne Hackborn
2013-05-21 00:54:19 +00:00
committed by Android (Google) Code Review
parent c46a41cd5a ec74da60cd
commit 62ef26c2cd
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/arrays.xml
View File

@@ -635,6 +635,7 @@
<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>keep awake</item>
</string-array> </string-array>
<!-- User display names for app ops codes --> <!-- User display names for app ops codes -->
@@ -670,6 +671,16 @@
<item>Play audio</item> <item>Play audio</item>
<item>Read clipboard</item> <item>Read clipboard</item>
<item>Modify clipboard</item> <item>Modify clipboard</item>
<item>Media buttons</item>
<item>Audio focus</item>
<item>Master volume</item>
<item>Voice volume</item>
<item>Ring volume</item>
<item>Media volume</item>
<item>Alarm volume</item>
<item>Notification volume</item>
<item>Bluetooth volume</item>
<item>Keep awake</item>
</string-array> </string-array>
<!-- Titles for the list of long press timeout options. --> <!-- Titles for the list of long press timeout options. -->

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

@@ -183,11 +183,13 @@ public class AppOpsState {
AppOpsManager.OP_ACCESS_NOTIFICATIONS, AppOpsManager.OP_ACCESS_NOTIFICATIONS,
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 },
new boolean[] { false, new boolean[] { false,
true, true,
true, true,
true, true,
true,
true, } true, }
); );