Merge "Added Settings intents" into rvc-dev am: a35a860c36 (f58df109) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -1869,6 +1869,24 @@ public final class Settings {
		@UnsupportedAppUsage
		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.
		* <p> If an user action is disabled by policy, this dialog can be triggered to let

+10 −0

Original line number	Diff line number	Diff line
		@@ -2674,4 +2674,14 @@ enum PageId {
		// CATEGORY: SETTINGS
		// OS: R
		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;
		}