Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 5ed91dd1cd

Change-Id: I0fb2af0231f06b879bc4a1c08cd803460b7181f9
This commit is contained in:
Michael Wright
2019-04-17 16:03:48 -07:00
committed by android-build-merger
parent c7ca36be34 5ed91dd1cd
commit 81a974d1e8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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";

8
core/java/android/provider/Settings.java
View File

@@ -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