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

Merge "Added Settings intents" into rvc-dev am: a35a860c36

Browse Source 
Change-Id: Ic08ff503cf38188219ec92f14fcdb178a7cde58e
This commit is contained in:
Fabian Kozynski
2020-04-09 18:04:50 +00:00
committed by Automerger Merge Worker
parent 671d3aed9a a35a860c36
commit f58df109f7
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1869,6 +1869,24 @@ public final class Settings {
@UnsupportedAppUsage @UnsupportedAppUsage
public static final String EXTRA_APP_UID = "app_uid"; public static final String EXTRA_APP_UID = "app_uid";
/**
* Activity Action: Show power menu settings.
*
* @hide
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_POWER_MENU_SETTINGS =
"android.settings.ACTION_POWER_MENU_SETTINGS";
/**
* Activity Action: Show controls settings.
*
* @hide
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_DEVICE_CONTROLS_SETTINGS =
"android.settings.ACTION_DEVICE_CONTROLS_SETTINGS";
/** /**
* Activity Action: Show a dialog with disabled by policy message. * Activity Action: Show a dialog with disabled by policy message.
* <p> If an user action is disabled by policy, this dialog can be triggered to let * <p> If an user action is disabled by policy, this dialog can be triggered to let

10
core/proto/android/app/settings_enums.proto
View File

@@ -2674,4 +2674,14 @@ enum PageId {
// CATEGORY: SETTINGS // CATEGORY: SETTINGS
// OS: R // OS: R
FUELGAUGE_ADVANCED_BATTERY_OPTION = 1842; FUELGAUGE_ADVANCED_BATTERY_OPTION = 1842;
// OPEN: Settings > System > Gestures > Power menu
// CATEGORY: SETTINGS
// OS: R
POWER_MENU_SETTINGS = 1843;
// OPEN: Settings > System > Gestures > Power menu > Device controls
// CATEGORY: SETTINGS
// OS: R
DEVICE_CONTROLS_SETTINGS = 1844;
} }