Merge "Add intent action constant to manage domain URLs." (b7006711) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -6055,6 +6055,7 @@ package android.provider {
		field public static final String ACTION_ACCESSIBILITY_DETAILS_SETTINGS = "android.settings.ACCESSIBILITY_DETAILS_SETTINGS";
		field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
		field public static final String ACTION_LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS = "android.settings.LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS";
		field public static final String ACTION_MANAGE_DOMAIN_URLS = "android.settings.MANAGE_DOMAIN_URLS";
		field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";
		field public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -1696,6 +1696,19 @@ public final class Settings {
		public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE =
		"android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";

		/**
		* Activity Action: Show screen that let user manage how Android handles URL resolution.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing
		*
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_MANAGE_DOMAIN_URLS = "android.settings.MANAGE_DOMAIN_URLS";

		// End of Intent actions for Settings

		/**