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

Merge "b/2441327 Added add account intent to public api."

Browse Source
This commit is contained in:
Erik Pasternak
2010-02-24 14:00:01 -08:00
committed by Android (Google) Code Review
parent 846ebf38ab eebc8e2e8f
commit 6550c72006
2 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/current.xml
View File

@@ -133509,6 +133509,17 @@
visibility="public"
>
</field>
<field name="ACTION_ADD_ACCOUNT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.settings.ADD_ACCOUNT_SETTINGS&quot;"
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="&quot;authorities&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class>
<class name="Settings.NameValueTable"
extends="java.lang.Object"

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

@@ -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";
@@ -3033,11 +3069,11 @@ public final class Settings {
* @hide
*/
public static final String ANR_SHOW_BACKGROUND = "anr_show_background";
/**
* The {@link ComponentName} string of the service to be used as the voice recognition
* service.
*
*
* @hide
*/
public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service";