summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-04-01 22:07:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-01 22:07:07 +0000
commit817d9b671fa60d2b67cb4723357d2dbf80ee0af5 (patch)
tree363c9694f4e83d641181e102fa45373e51e16b16
parentfc98f99c84e2c073cdd3be18d17c3c9a6169ab9b (diff)
parent113441e661e5bf9c1f02e569b7b9997f7e45243b (diff)
Merge "Add a "More" item for the new default apps list."
-rw-r--r--api/system-current.txt1
-rw-r--r--core/java/android/provider/Settings.java16
2 files changed, 17 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index a1b182697345..d31757cf784b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6055,6 +6055,7 @@ package android.provider {
field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
field public static final String ACTION_LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS = "android.settings.LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS";
field public static final String ACTION_MANAGE_DOMAIN_URLS = "android.settings.MANAGE_DOMAIN_URLS";
+ field public static final String ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_MORE_DEFAULT_APPS_SETTINGS";
field public static final String ACTION_NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS";
field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";
field public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a97db101dc93..8eac66b58e69 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1501,6 +1501,22 @@ public final class Settings {
= "android.settings.MANAGE_DEFAULT_APPS_SETTINGS";
/**
+ * Activity Action: Show More default apps settings.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you safeguard against this.
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ *
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ @SystemApi
+ public static final String ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS =
+ "android.settings.MANAGE_MORE_DEFAULT_APPS_SETTINGS";
+
+ /**
* Activity Action: Show notification settings.
*
* @hide