Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2624bf7 authored by Alon Albert's avatar Alon Albert Committed by Android Git Automerger
Browse files

am 174ea7d1: Merge "Document extra account_types" into jb-mr2-dev 

* commit '174ea7d1':
  Document extra account_types
parents 1bf67bd4 174ea7d1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -18905,6 +18905,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_WIRELESS_SETTINGS = "android.settings.WIRELESS_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_INPUT_METHOD_ID = "input_method_id";

  }

core/java/android/provider/Settings.java

+6 −2
Original line number Diff line number Diff line
@@ -511,6 +511,9 @@ public final class Settings { 
     * 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>

     * 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.

     * <p>

     * Output: Nothing.
@@ -693,8 +696,9 @@ public final class Settings { 
     * Example: The {@link #ACTION_ADD_ACCOUNT} intent restricts the account types available based

     * on the authority given.

     */

    public static final String EXTRA_AUTHORITIES =

            "authorities";

    public static final String EXTRA_AUTHORITIES = "authorities";



    public static final String EXTRA_ACCOUNT_TYPES = "account_types";



    public static final String EXTRA_INPUT_METHOD_ID = "input_method_id";