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

Commit 8fe603dd authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Created SaveInfo types for email and username." into oc-dev am: aaca304a 

am: ff43ec44

Change-Id: Ied5509382cd1edb27c81e8a68ddb95c53fc147fd
parents 690694f7 ff43ec44

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37069,8 +37069,10 @@ package android.service.autofill { 
    field public static final android.os.Parcelable.Creator<android.service.autofill.SaveInfo> CREATOR;

    field public static final int SAVE_DATA_TYPE_ADDRESS = 2; // 0x2

    field public static final int SAVE_DATA_TYPE_CREDIT_CARD = 3; // 0x3

    field public static final int SAVE_DATA_TYPE_EMAIL_ADDRESS = 5; // 0x5

    field public static final int SAVE_DATA_TYPE_GENERIC = 0; // 0x0

    field public static final int SAVE_DATA_TYPE_PASSWORD = 1; // 0x1

    field public static final int SAVE_DATA_TYPE_USERNAME = 4; // 0x4

  }















  public static final class SaveInfo.Builder {

























api/system-current.txt



+2
−0






























Original line number
Diff line number
Diff line








@@ -40141,8 +40141,10 @@ package android.service.autofill {













    field public static final android.os.Parcelable.Creator<android.service.autofill.SaveInfo> CREATOR;















    field public static final int SAVE_DATA_TYPE_ADDRESS = 2; // 0x2















    field public static final int SAVE_DATA_TYPE_CREDIT_CARD = 3; // 0x3













    field public static final int SAVE_DATA_TYPE_EMAIL_ADDRESS = 5; // 0x5















    field public static final int SAVE_DATA_TYPE_GENERIC = 0; // 0x0















    field public static final int SAVE_DATA_TYPE_PASSWORD = 1; // 0x1













    field public static final int SAVE_DATA_TYPE_USERNAME = 4; // 0x4















  }





























  public static final class SaveInfo.Builder {

























api/test-current.txt



+2
−0






























Original line number
Diff line number
Diff line








@@ -37228,8 +37228,10 @@ package android.service.autofill {













    field public static final android.os.Parcelable.Creator<android.service.autofill.SaveInfo> CREATOR;















    field public static final int SAVE_DATA_TYPE_ADDRESS = 2; // 0x2















    field public static final int SAVE_DATA_TYPE_CREDIT_CARD = 3; // 0x3













    field public static final int SAVE_DATA_TYPE_EMAIL_ADDRESS = 5; // 0x5















    field public static final int SAVE_DATA_TYPE_GENERIC = 0; // 0x0















    field public static final int SAVE_DATA_TYPE_PASSWORD = 1; // 0x1













    field public static final int SAVE_DATA_TYPE_USERNAME = 4; // 0x4















  }





























  public static final class SaveInfo.Builder {

























core/java/android/service/autofill/SaveInfo.java



+12
−0






























Original line number
Diff line number
Diff line








@@ -129,6 +129,16 @@ public final class SaveInfo implements Parcelable {













     */















    public static final int SAVE_DATA_TYPE_CREDIT_CARD = 3;





























    /**













     * Type used when the {@link FillResponse} represents just an username, without a password.













     */













    public static final int SAVE_DATA_TYPE_USERNAME = 4;



























    /**













     * Type used when the {@link FillResponse} represents just an email address, without a password.













     */













    public static final int SAVE_DATA_TYPE_EMAIL_ADDRESS = 5;





























    private final @SaveDataType int mType;















    private final CharSequence mNegativeActionTitle;















    private final IntentSender mNegativeActionListener;










@@ -222,6 +232,8 @@ public final class SaveInfo implements Parcelable {













                case SAVE_DATA_TYPE_PASSWORD:















                case SAVE_DATA_TYPE_ADDRESS:















                case SAVE_DATA_TYPE_CREDIT_CARD:













                case SAVE_DATA_TYPE_USERNAME:













                case SAVE_DATA_TYPE_EMAIL_ADDRESS:















                    mType = type;















                    break;















                default:

































core/res/res/values/strings.xml



+4
−0






























Original line number
Diff line number
Diff line








@@ -4602,6 +4602,10 @@













    <string name="autofill_save_type_address">address</string>















    <!-- Label for the type of data being saved for autofill when it represents a credit card [CHAR LIMIT=NONE] -->















    <string name="autofill_save_type_credit_card">credit card</string>













    <!-- Label for the type of data being saved for autofill when it represents an username [CHAR LIMIT=NONE] -->













    <string name="autofill_save_type_username">username</string>













    <!-- Label for the type of data being saved for autofill when it represents an email address [CHAR LIMIT=NONE] -->













    <string name="autofill_save_type_email_address">email address</string>































    <!-- Primary ETWS (Earthquake and Tsunami Warning System) default message for earthquake -->















    <string name="etws_primary_default_message_earthquake">Stay calm and seek shelter nearby.</string>