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

Commit 4e56a0e4 authored by Sean Stout's avatar Sean Stout Committed by android-build-merger
Browse files

Merge "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" into qt-dev 

am: a0d85290

Change-Id: Id698778342efb7e523fcfc63e41b86e5c7a397b4
parents 6eaf97ec a0d85290

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38606,6 +38606,7 @@ package android.provider { 
    field public static final String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS";

    field public static final String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS";

    field public static final String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";

    field public static final String ACTION_APP_BATTERY_SETTINGS = "android.settings.APP_BATTERY_SETTINGS";

    field public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS";

    field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";

    field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";

core/java/android/provider/Settings.java

+3 −5
Original line number Diff line number Diff line
@@ -955,18 +955,16 @@ public final class Settings { 
            "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";















    /**













     * Activity Action: Open the advanced power usage details page of an associated app.













     * Activity Action: Open the battery details page of an associated app.















     * <p>















     * Input: Intent's data URI set with an application name, using the















     * "package" schema (like "package:com.my.app")















     * <p>















     * Output: Nothing.













     *













     * @hide















     */















    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL =













            "android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL";













    public static final String ACTION_APP_BATTERY_SETTINGS =













            "android.settings.APP_BATTERY_SETTINGS";





























    /**















     * Activity Action: Show screen for controlling background data