Merge "b/2441327 Added add account intent to public api." (6550c720) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Diff line number	Diff line
		@@ -133509,6 +133509,17 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_ADD_ACCOUNT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.settings.ADD_ACCOUNT_SETTINGS""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_AIRPLANE_MODE_SETTINGS"
		type="java.lang.String"
		transient="false"
		@@ -133817,6 +133828,17 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_AUTHORITIES"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""authorities""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="Settings.NameValueTable"
		extends="java.lang.Object"

core/java/android/provider/Settings.java

+38 −2

Original line number	Diff line number	Diff line
		@@ -374,6 +374,11 @@ public final class Settings {
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* The account types available to add via the add account button may be restricted by adding an
		* {@link #EXTRA_AUTHORITIES} extra to this Intent with one or more syncable content provider's
		* authorities. Only account types which can sync with that content provider will be offered to
		* the user.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		@@ -382,6 +387,24 @@ public final class Settings {
		public static final String ACTION_SYNC_SETTINGS =
		"android.settings.SYNC_SETTINGS";

		/**
		* Activity Action: Show add account screen for creating a new account.
		* <p>
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* The account types available to add may be restricted by adding an {@link #EXTRA_AUTHORITIES}
		* extra to the Intent with one or more syncable content provider's authorities. Only account
		* types which can sync with that content provider will be offered to the user.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_ADD_ACCOUNT =
		"android.settings.ADD_ACCOUNT_SETTINGS";

		/**
		* Activity Action: Show settings for selecting the network operator.
		* <p>
		@@ -468,6 +491,19 @@ public final class Settings {

		// End of Intent actions for Settings

		/**
		* Activity Extra: Limit available options in launched activity based on the given authority.
		* <p>
		* This can be passed as an extra field in an Activity Intent with one or more syncable content
		* provider's authorities as a String[]. This field is used by some intents to alter the
		* behavior of the called activity.
		* <p>
		* Example: The {@link #ACTION_ADD_ACCOUNT} intent restricts the account types available based
		* on the authority given.
		*/
		public static final String EXTRA_AUTHORITIES =
		"authorities";

		private static final String JID_RESOURCE_PREFIX = "android";

		public static final String AUTHORITY = "settings";