summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorFabian Kozynski <kozynski@google.com>2020-04-09 17:58:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-09 17:58:44 +0000
commita35a860c360a3bfc6449659418c9b33b024ce249 (patch)
treec1ad77e70d0f38de147bfc060c47dcbdbf5047e7 /core/java/android
parent279238f3c24be0b87d773118f4f55b9638541801 (diff)
parentb5fe4900ea2b752664993d01be66b87b4a81e3c4 (diff)
Merge "Added Settings intents" into rvc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 920302c75011..541883346e23 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1870,6 +1870,24 @@ public final class Settings {
public static final String EXTRA_APP_UID = "app_uid";
/**
+ * Activity Action: Show power menu settings.
+ *
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_POWER_MENU_SETTINGS =
+ "android.settings.ACTION_POWER_MENU_SETTINGS";
+
+ /**
+ * Activity Action: Show controls settings.
+ *
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_DEVICE_CONTROLS_SETTINGS =
+ "android.settings.ACTION_DEVICE_CONTROLS_SETTINGS";
+
+ /**
* Activity Action: Show a dialog with disabled by policy message.
* <p> If an user action is disabled by policy, this dialog can be triggered to let
* the user know about this.