From 0962262f42e3636270689100e1bb90b8f3cf6d77 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 4 Apr 2017 10:13:08 -0700 Subject: [PATCH] Created SaveInfo types for email and username. Bug: 35707731 Test: LoginActivityTest#testCustomizedSaveUsername Test: LoginActivityTest#testCustomizedSaveEmailAddress Change-Id: I3598c64e4f6bb9ceff544c3994d6cdeebd760a85 --- api/current.txt | 2 ++ api/system-current.txt | 2 ++ api/test-current.txt | 2 ++ core/java/android/service/autofill/SaveInfo.java | 12 ++++++++++++ core/res/res/values/strings.xml | 4 ++++ core/res/res/values/symbols.xml | 2 ++ .../java/com/android/server/autofill/ui/SaveUi.java | 6 ++++++ 7 files changed, 30 insertions(+) diff --git a/api/current.txt b/api/current.txt index e640e30cae33f..99e0a3753e350 100644 --- a/api/current.txt +++ b/api/current.txt @@ -37066,8 +37066,10 @@ package android.service.autofill { field public static final android.os.Parcelable.Creator 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 { diff --git a/api/system-current.txt b/api/system-current.txt index 383b3321b1de6..861284fb830cd 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -40102,8 +40102,10 @@ package android.service.autofill { field public static final android.os.Parcelable.Creator 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 { diff --git a/api/test-current.txt b/api/test-current.txt index 795342fdc7637..a04c14d646798 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -37224,8 +37224,10 @@ package android.service.autofill { field public static final android.os.Parcelable.Creator 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 { diff --git a/core/java/android/service/autofill/SaveInfo.java b/core/java/android/service/autofill/SaveInfo.java index 6213d27bfc709..1274cca392ab8 100644 --- a/core/java/android/service/autofill/SaveInfo.java +++ b/core/java/android/service/autofill/SaveInfo.java @@ -130,6 +130,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; @@ -223,6 +233,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: diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 831cf89e0e972..b112a5ca886b0 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4600,6 +4600,10 @@ address credit card + + username + + email address Stay calm and seek shelter nearby. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ae05a69da20df..fac0e0c0be693 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2883,6 +2883,8 @@ + + diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index 509351bf0858b..2c08afadf10b9 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java @@ -117,6 +117,12 @@ final class SaveUi { case SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD: type = context.getString(R.string.autofill_save_type_credit_card); break; + case SaveInfo.SAVE_DATA_TYPE_USERNAME: + type = context.getString(R.string.autofill_save_type_username); + break; + case SaveInfo.SAVE_DATA_TYPE_EMAIL_ADDRESS: + type = context.getString(R.string.autofill_save_type_email_address); + break; default: type = null; }