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

Commit 253ee76d authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Add action for reaching ignore battery optimizations" into mnc-dev

parents 8bbbcd3d 287b889f

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -26537,6 +26537,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_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";

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

    field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";

    field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";

    field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -28569,6 +28569,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_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";

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

    field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";

    field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";

    field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";

core/java/android/provider/Settings.java

+15 −0
Original line number Original line Diff line number Diff line
@@ -576,6 +576,21 @@ public final class Settings { 
    public static final String ACTION_APPLICATION_DETAILS_SETTINGS =

    public static final String ACTION_APPLICATION_DETAILS_SETTINGS =

            "android.settings.APPLICATION_DETAILS_SETTINGS";

            "android.settings.APPLICATION_DETAILS_SETTINGS";





    /**

     * Activity Action: Show screen for controlling which apps can ignore battery optimizations.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.

     * <p>

     * Input: The Intent's data URI specifies the application package name

     * to be shown, with the "package" scheme.  That is "package:com.my.app".

     * <p>

     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS =

            "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS";



    /**

    /**

     * @hide

     * @hide

     * Activity Action: Show the "app ops" settings screen.

     * Activity Action: Show the "app ops" settings screen.