diff options
| author | David Christie <dnchrist@google.com> | 2013-08-01 19:26:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-01 19:26:08 +0000 |
| commit | 34605e1dcf4ac61109911836e7bba864f62080d6 (patch) | |
| tree | ca6d2b8652a316505c4dda94a9a6dca46619e876 | |
| parent | e990420f52ae7832cbf7bc6ad4f96b6c7a8244c8 (diff) | |
| parent | 4a06e4cc4370f5897f07f6314f25b37db759cf18 (diff) | |
| download | packages_apps_Settings-34605e1dcf4ac61109911836e7bba864f62080d6.tar.gz packages_apps_Settings-34605e1dcf4ac61109911836e7bba864f62080d6.tar.bz2 packages_apps_Settings-34605e1dcf4ac61109911836e7bba864f62080d6.zip | |
Merge "Add Strings for the new high power location monitoring app op."
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/applications/AppOpsState.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 99a2e91a7..2e3d6db6e 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -572,7 +572,7 @@ <item>gid</item> </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"> <item>Internal device storage</item> <item>Removable SD card</item> @@ -639,6 +639,7 @@ <item>bluetooth volume</item> <item>keep awake</item> <item>monitor location</item> + <item>monitor high power location</item> </string-array> <!-- User display names for app ops codes --> @@ -685,6 +686,7 @@ <item>Bluetooth volume</item> <item>Keep awake</item> <item>Location</item> + <item>Location</item> </string-array> <!-- Titles for the list of long press timeout options. --> diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java index 61ed2f46b..9243b0efa 100644 --- a/src/com/android/settings/applications/AppOpsState.java +++ b/src/com/android/settings/applications/AppOpsState.java @@ -102,13 +102,15 @@ public class AppOpsState { AppOpsManager.OP_GPS, AppOpsManager.OP_WIFI_SCAN, AppOpsManager.OP_NEIGHBORING_CELLS, - AppOpsManager.OP_MONITOR_LOCATION }, + AppOpsManager.OP_MONITOR_LOCATION, + AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION}, new boolean[] { true, true, false, false, false, - false } + false, + false} ); public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate( |