diff options
| author | 2015-12-31 15:29:50 +0000 | |
|---|---|---|
| committer | 2015-12-31 17:55:17 +0000 | |
| commit | 410e6bd3cc948d283a2ce68c13e88679a2e9c67d (patch) | |
| tree | 5215503c0b9e4e084f621260dff86164703e49c0 | |
| parent | 44b8102d7137b30d3aa6c297cea849ae73e1e10b (diff) | |
Add an intent for ShowAdminSupportDetailsDialog in settings.
Bug: 26362585
Change-Id: Ia3adfcde50f2f5d4fd3df924d56d970d67339094
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
4 files changed, 16 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ec65b250de15..c27e9af38b9a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31224,6 +31224,7 @@ package android.provider { field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS"; field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS"; + field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS"; field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO"; field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS"; field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS"; diff --git a/api/system-current.txt b/api/system-current.txt index e992a77e28f4..4a80059066bb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33366,6 +33366,7 @@ package android.provider { field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS"; field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS"; + field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS"; field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO"; field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS"; field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS"; diff --git a/api/test-current.txt b/api/test-current.txt index 42a6a86dcabc..89ab50df22e2 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -31227,6 +31227,7 @@ package android.provider { field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS"; field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS"; + field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS"; field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO"; field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS"; field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b883f9c736d0..ccd1a6bbe09a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1138,6 +1138,19 @@ public final class Settings { /** @hide */ public static final String EXTRA_APP_UID = "app_uid"; /** @hide */ public static final String EXTRA_APP_PACKAGE = "app_package"; + /** + * 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. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS + = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS"; + // End of Intent actions for Settings /** |