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

Merge "Add Strings for the new high power location monitoring app op."

Browse Source
This commit is contained in:
David Christie
2013-08-01 19:26:08 +00:00
committed by Android (Google) Code Review
parent e990420f52 4a06e4cc43
commit 34605e1dcf
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/arrays.xml
View File

@@ -572,7 +572,7 @@
<item>gid</item> <item>gid</item>
</string-array> </string-array>
<!-- Apps on SD instalaltion location options in ApplicationSettings --> <!-- Apps on SD installation location options in ApplicationSettings -->
<string-array name="app_install_location_entries"> <string-array name="app_install_location_entries">
<item>Internal device storage</item> <item>Internal device storage</item>
<item>Removable SD card</item> <item>Removable SD card</item>
@@ -639,6 +639,7 @@
<item>bluetooth volume</item> <item>bluetooth volume</item>
<item>keep awake</item> <item>keep awake</item>
<item>monitor location</item> <item>monitor location</item>
<item>monitor high power location</item>
</string-array> </string-array>
<!-- User display names for app ops codes --> <!-- User display names for app ops codes -->
@@ -685,6 +686,7 @@
<item>Bluetooth volume</item> <item>Bluetooth volume</item>
<item>Keep awake</item> <item>Keep awake</item>
<item>Location</item> <item>Location</item>
<item>Location</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

@@ -102,12 +102,14 @@ public class AppOpsState {
AppOpsManager.OP_GPS, AppOpsManager.OP_GPS,
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},
new boolean[] { true, new boolean[] { true,
true, true,
false, false,
false, false,
false, false,
false,
false} false}
); );