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

Commit 057a1014 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev 

am: e8ed2ed3

* commit 'e8ed2ed3':
  Add an Activity action to go into the Deletion Helper.

Change-Id: I09b09f645b455c8a2cde7bd0eadb34b2cc704178
parents 60b75a94 e8ed2ed3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32346,6 +32346,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";

    field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";

    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";

    field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";

    field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

    field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35045,6 +35045,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";

    field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";

    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";

    field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";

    field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

    field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32419,6 +32419,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";

    field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";

    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";

    field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";

    field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

    field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,17 @@ public final class Settings { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_WEBVIEW_SETTINGS = "android.settings.WEBVIEW_SETTINGS";



    /**

     * Activity Action: Show the Deletion Helper settings.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_DELETION_HELPER_SETTINGS

            = "android.settings.DELETION_HELPER_SETTINGS";



    // End of Intent actions for Settings



    /**