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

Merge "Document extra account_types" into jb-mr2-dev

Browse Source
This commit is contained in:
Alon Albert
2013-02-26 23:17:00 +00:00
committed by Android (Google) Code Review
parent 3383d393a7 50359c26e7
commit 174ea7d1a7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -18904,6 +18904,7 @@ package android.provider {
field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS"; field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
field public static final java.lang.String AUTHORITY = "settings"; field public static final java.lang.String AUTHORITY = "settings";
field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";
field public static final java.lang.String EXTRA_AUTHORITIES = "authorities"; field public static final java.lang.String EXTRA_AUTHORITIES = "authorities";
field public static final java.lang.String EXTRA_INPUT_METHOD_ID = "input_method_id"; field public static final java.lang.String EXTRA_INPUT_METHOD_ID = "input_method_id";
} }

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

@@ -511,6 +511,9 @@ public final class Settings {
* extra to the Intent with one or more syncable content provider's authorities. Only account * 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. * types which can sync with that content provider will be offered to the user.
* <p> * <p>
* Account types can also be filtered by adding an {@link #EXTRA_ACCOUNT_TYPES} extra to the
* Intent with one or more account types.
* <p>
* Input: Nothing. * Input: Nothing.
* <p> * <p>
* Output: Nothing. * Output: Nothing.
@@ -693,8 +696,9 @@ public final class Settings {
* Example: The {@link #ACTION_ADD_ACCOUNT} intent restricts the account types available based * Example: The {@link #ACTION_ADD_ACCOUNT} intent restricts the account types available based
* on the authority given. * on the authority given.
*/ */
public static final String EXTRA_AUTHORITIES = public static final String EXTRA_AUTHORITIES = "authorities";
"authorities";
public static final String EXTRA_ACCOUNT_TYPES = "account_types";
public static final String EXTRA_INPUT_METHOD_ID = "input_method_id"; public static final String EXTRA_INPUT_METHOD_ID = "input_method_id";