summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Settings.java
diff options
context:
space:
mode:
authorBilly Lau <billylau@google.com>2015-07-27 12:57:07 +0100
committerBilly Lau <billylau@google.com>2015-07-29 23:04:57 +0100
commitfee785645b57c519a31ed403e60e8f76dcc8abbb (patch)
treee49c811994cd72fd8bbc94391b694cf839088a39 /src/com/android/settings/Settings.java
parente37e12321b125731dfff69240b6e49bd00de2a3c (diff)
downloadpackages_apps_Settings-fee785645b57c519a31ed403e60e8f76dcc8abbb.zip
packages_apps_Settings-fee785645b57c519a31ed403e60e8f76dcc8abbb.tar.gz
packages_apps_Settings-fee785645b57c519a31ed403e60e8f76dcc8abbb.tar.bz2
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's
page instead of the top level one Settings: Added two activities to handle app-specific Intent when app invoke permission management UI. SettingsActivity: Added two fragment classes to handle app-specific Intent when app invoke permission management UI. AndroidManifest.xml: We handle both Intent to top level settings and app-specific management UI for app ops protected permissions. AppStateAppOpsBridge: Added a new field to PermissionState to keep track of permission declared vs one that is actually granted during install time. AppState{Overlay/Usage/WriteSettings}Bridge: Updated the fields affected by changes in PermissionState. {DrawOverlay/UsageAccess/WriteSettings}Details: Disabled the toggling of permission if the app did not declare for the asked permission. Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557
Diffstat (limited to 'src/com/android/settings/Settings.java')
-rw-r--r--src/com/android/settings/Settings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f606193..7b94d79 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -116,4 +116,6 @@ public class Settings extends SettingsActivity {
public static class MemorySettingsActivity extends SettingsActivity { /* empty */ }
public static class OverlaySettingsActivity extends SettingsActivity { /* empty */ }
public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }
+ public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }
+ public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }
}