Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 918343b5 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Add an intent for ShowAdminSupportDetailsDialog in settings."

parents 6190d9cf 410e6bd3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31236,6 +31236,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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33371,6 +33371,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";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31248,6 +31248,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";

core/java/android/provider/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,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



    /**