summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShashank Mittal <mittals@codeaurora.org>2013-09-05 19:01:47 -0700
committerMichael Bestas <mikeioannina@gmail.com>2016-01-03 14:43:50 -0800
commitd52a92dbbc4df34025153266064a521d5d3aab4d (patch)
treedea327b7b842bd45234c474ca9f63166b8d799c6
parent090a9c69d8d1ccdc15bc78826a2ce443fc1f0d10 (diff)
downloadpackages_apps_Settings-d52a92dbbc4df34025153266064a521d5d3aab4d.zip
packages_apps_Settings-d52a92dbbc4df34025153266064a521d5d3aab4d.tar.gz
packages_apps_Settings-d52a92dbbc4df34025153266064a521d5d3aab4d.tar.bz2
AppOps: Add more operations in app ops settings.
Add following operations in app ops settings. -- Wifi enable/disable -- Bluetooth enable/disable Change-Id: I32183d77b88c326168557444a445765b5a69de6f AppOps: Add support for nfc operation Add support for nfc operation Change-Id: I0ca617b11d3f65f80cc49c3f629312e2fee1ba91 AppOps: Add mobile data-on permission control. Add mobile data-on permission control. Change-Id: I0956fb1575addb5f4e522e664a80442120190b86
-rw-r--r--res/values/arrays.xml3
-rw-r--r--src/com/android/settings/applications/AppOpsState.java14
2 files changed, 13 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 581427e..f06b1e1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -683,6 +683,7 @@
<item>monitor high power location</item>
<item>get usage stats</item>
<item>mute/unmute microphone</item>
+ <item>toast window</item>
<item>project media</item>
<item>activate VPN</item>
<item>write wallpaper</item>
@@ -700,7 +701,7 @@
<item>write external storage</item>
<item>turn screen on</item>
<item>get accounts</item>
- <item>change wifi</item>
+ <item>toggle wi-fi</item>
<item>toggle bluetooth</item>
<item>start at boot</item>
<item>toggle nfc</item>
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 5ac08c7..d035c88 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -167,7 +167,7 @@ public class AppOpsState {
AppOpsManager.OP_AUDIO_ALARM_VOLUME,
AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME,
- AppOpsManager.OP_MUTE_MICROPHONE},
+ AppOpsManager.OP_MUTE_MICROPHONE },
new boolean[] { false,
true,
true,
@@ -194,7 +194,11 @@ public class AppOpsState {
AppOpsManager.OP_PROJECT_MEDIA,
AppOpsManager.OP_ACTIVATE_VPN,
AppOpsManager.OP_ASSIST_STRUCTURE,
- AppOpsManager.OP_ASSIST_SCREENSHOT},
+ AppOpsManager.OP_ASSIST_SCREENSHOT,
+ AppOpsManager.OP_WIFI_CHANGE,
+ AppOpsManager.OP_BLUETOOTH_CHANGE,
+ AppOpsManager.OP_NFC_CHANGE,
+ AppOpsManager.OP_DATA_CONNECT_CHANGE },
new boolean[] { false,
true,
true,
@@ -204,7 +208,11 @@ public class AppOpsState {
false,
false,
false,
- false }
+ false,
+ true,
+ true,
+ true,
+ true }
);
public static final OpsTemplate BOOTUP_TEMPLATE = new OpsTemplate(