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

Commit 4ae7523a authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Revert "Add android.settings.ACTION_APP_BATTERY_SETTINGS to... 

Merge "Merge "Revert "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API"" into qt-dev am: 5ed91dd1 am: 81a974d1"
parents baca2b99 47106462

api/current.txt

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

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









    /**









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









     * Activity Action: Open the advanced power usage 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_APP_BATTERY_SETTINGS =









            "android.settings.APP_BATTERY_SETTINGS";









    public static final String ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL =









            "android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL";

















    /**









     * Activity Action: Show screen for controlling background data