Merge "Added Settings intents" into rvc-dev (a35a860c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}