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

Change autoFillHint to list of strings

Browse Source 
Test: Ran autofill CTS tests
Fixes: 35364993
Change-Id: I3f4ceb719b2d3fef0168e8300c0d15f1661560c0
This commit is contained in:
Philip P. Moltmann
2017-03-10 16:45:02 -08:00
parent 41eae9115c
commit 495cadd8a9
7 changed files with 153 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/assist/AssistStructure.java
View File

@@ -1,5 +1,6 @@
package android.app.assist;
import android.annotation.Nullable;
import android.app.Activity;
import android.content.ComponentName;
import android.graphics.Matrix;
@@ -590,7 +591,7 @@ public class AssistStructure implements Parcelable {
// fields (viewId and childId) of the field.
AutofillId mAutofillId;
@View.AutofillType int mAutofillType;
@View.AutofillHint int mAutofillHint;
@Nullable String[] mAutofillHint;
AutofillValue mAutofillValue;
String[] mAutofillOptions;
boolean mSanitized;
@@ -676,7 +677,7 @@ public class AssistStructure implements Parcelable {
mSanitized = in.readInt() == 1;
mAutofillId = in.readParcelable(null);
mAutofillType = in.readInt();
mAutofillHint = in.readInt();
mAutofillHint = in.readStringArray();
mAutofillValue = in.readParcelable(null);
mAutofillOptions = in.readStringArray();
}
@@ -810,7 +811,7 @@ public class AssistStructure implements Parcelable {
out.writeInt(mSanitized ? 1 : 0);
out.writeParcelable(mAutofillId, 0);
out.writeInt(mAutofillType);
out.writeInt(mAutofillHint);
out.writeStringArray(mAutofillHint);
final AutofillValue sanitizedValue = writeSensitive ? mAutofillValue : null;
out.writeParcelable(sanitizedValue, 0);
out.writeStringArray(mAutofillOptions);
@@ -949,7 +950,7 @@ public class AssistStructure implements Parcelable {
*
* @return The hint for this view
*/
@View.AutofillHint public int getAutoFillHint() {
@Nullable public String[] getAutoFillHint() {
return mAutofillHint;
}
@@ -1663,7 +1664,7 @@ public class AssistStructure implements Parcelable {
}
@Override
public void setAutofillHint(@View.AutofillHint int hint) {
public void setAutofillHint(@Nullable String[] hint) {
mNode.mAutofillHint = hint;
}
@@ -1812,7 +1813,7 @@ public class AssistStructure implements Parcelable {
+ ", type=" + node.getAutofillType()
+ ", options=" + Arrays.toString(node.getAutofillOptions())
+ ", inputType=" + node.getInputType()
+ ", hint=" + Integer.toHexString(node.getAutoFillHint())
+ ", hint=" + Arrays.toString(node.getAutoFillHint())
+ ", value=" + node.getAutofillValue()
+ ", sanitized=" + node.isSanitized());
}

165
core/java/android/view/View.java
View File

@@ -978,142 +978,123 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
public static final int AUTOFILL_MODE_MANUAL = 2;
/** @hide */
@IntDef({
AUTOFILL_HINT_NONE,
AUTOFILL_HINT_EMAIL_ADDRESS,
AUTOFILL_HINT_NAME,
AUTOFILL_HINT_POSTAL_ADDRESS,
AUTOFILL_HINT_PASSWORD,
AUTOFILL_HINT_PHONE,
AUTOFILL_HINT_USERNAME,
AUTOFILL_HINT_POSTAL_CODE,
AUTOFILL_HINT_CREDIT_CARD_NUMBER,
AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE,
AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE,
AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH,
AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR,
AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY,
})
@Retention(RetentionPolicy.SOURCE)
public @interface AutofillHint {}
/**
* No autofill hint is set.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_NONE = 0;
/**
* This view contains an email address.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value #AUTOFILL_HINT_EMAIL_ADDRESS}"
* to <a href="#attr_android:autofillHint"> {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_EMAIL_ADDRESS = 0x1;
public static final String AUTOFILL_HINT_EMAIL_ADDRESS = "emailAddress";
/**
* The view contains a real name.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value #AUTOFILL_HINT_NAME}" to
* <a href="#attr_android:autofillHint"> {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_NAME = 0x2;
public static final String AUTOFILL_HINT_NAME = "name";
/**
* The view contains a user name.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value #AUTOFILL_HINT_USERNAME}" to
* <a href="#attr_android:autofillHint"> {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_USERNAME = 0x4;
public static final String AUTOFILL_HINT_USERNAME = "username";
/**
* The view contains a password.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value #AUTOFILL_HINT_PASSWORD}" to
* <a href="#attr_android:autofillHint"> {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_PASSWORD = 0x8;
public static final String AUTOFILL_HINT_PASSWORD = "password";
/**
* The view contains a phone number.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value #AUTOFILL_HINT_PHONE}" to
* <a href="#attr_android:autofillHint"> {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_PHONE = 0x10;
public static final String AUTOFILL_HINT_PHONE = "phone";
/**
* The view contains a postal address.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value #AUTOFILL_HINT_POSTAL_ADDRESS}"
* to <a href="#attr_android:autofillHint"> {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_POSTAL_ADDRESS = 0x20;
public static final String AUTOFILL_HINT_POSTAL_ADDRESS = "postalAddress";
/**
* The view contains a postal code.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value #AUTOFILL_HINT_POSTAL_CODE}" to
* <a href="#attr_android:autofillHint"> {@code android:autofillHint}.
*/
public static final int AUTOFILL_HINT_POSTAL_CODE = 0x40;
public static final String AUTOFILL_HINT_POSTAL_CODE = "postalCode";
/**
* The view contains a credit card number.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value
* #AUTOFILL_HINT_CREDIT_CARD_NUMBER}" to <a href="#attr_android:autofillHint"> {@code
* android:autofillHint}.
*/
public static final int AUTOFILL_HINT_CREDIT_CARD_NUMBER = 0x80;
public static final String AUTOFILL_HINT_CREDIT_CARD_NUMBER = "creditCardNumber";
/**
* The view contains a credit card security code.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value
* #AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE}" to <a href="#attr_android:autofillHint"> {@code
* android:autofillHint}.
*/
public static final int AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = 0x100;
public static final String AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = "creditCardSecurityCode";
/**
* The view contains a credit card expiration date.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value
* #AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE}" to <a href="#attr_android:autofillHint"> {@code
* android:autofillHint}.
*/
public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = 0x200;
public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE =
"creditCardExpirationDate";
/**
* The view contains the month a credit card expires.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value
* #AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH}" to <a href="#attr_android:autofillHint"> {@code
* android:autofillHint}.
*/
public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = 0x400;
public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH =
"creditCardExpirationMonth";
/**
* The view contains the year a credit card expires.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value
* #AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR}" to <a href="#attr_android:autofillHint"> {@code
* android:autofillHint}.
*/
public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = 0x800;
public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR =
"creditCardExpirationYear";
/**
* The view contains the day a credit card expires.
*
* Use with {@link #setAutofillHint(int)} and <a href="#attr_android:autofillHint">
* {@code android:autofillHint}.
* Use with {@link #setAutofillHint(String[])}, or set "{@value
* #AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY}" to <a href="#attr_android:autofillHint"> {@code
* android:autofillHint}.
*/
public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = 0x1000;
public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = "creditCardExpirationDay";
/**
* Hint for the autofill services that describes the content of the view.
* Hintd for the autofill services that describes the content of the view.
*/
@AutofillHint private int mAutofillHint;
private @Nullable String[] mAutofillHint;
/** @hide */
@IntDef({
@@ -5049,7 +5030,37 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
break;
case R.styleable.View_autofillHint:
if (a.peekValue(attr) != null) {
setAutofillHint(a.getInt(attr, AUTOFILL_HINT_NONE));
CharSequence[] rawHints = null;
String rawString = null;
if (a.getType(attr) == TypedValue.TYPE_REFERENCE) {
int resId = a.getResourceId(attr, 0);
try {
rawHints = a.getTextArray(attr);
} catch (NullPointerException e) {
rawString = getResources().getString(resId);
}
} else {
rawString = a.getString(attr);
}
if (rawHints == null) {
if (rawString == null) {
throw new IllegalArgumentException(
"Could not resolve autofillHint");
} else {
rawHints = rawString.split(",");
}
}
String[] hints = new String[rawHints.length];
int numHints = rawHints.length;
for (int rawHintNum = 0; rawHintNum < numHints; rawHintNum++) {
hints[rawHintNum] = rawHints[rawHintNum].toString().trim();
}
setAutofillHint(hints);
}
break;
case R.styleable.View_importantForAutofill:
@@ -7453,12 +7464,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/**
* Describes the content of a view so that a autofill service can fill in the appropriate data.
*
* @return The hint set via the attribute
* @return The hint set via the attribute or {@code null} if no hint it set.
*
* @attr ref android.R.styleable#View_autofillHint
*/
@ViewDebug.ExportedProperty()
@AutofillHint public int getAutofillHint() {
@Nullable public String[] getAutofillHint() {
return mAutofillHint;
}
@@ -9088,11 +9099,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* Sets the a hint that helps the autofill service to select the appropriate data to fill the
* view.
*
* @param autofillHint The autofill hint to set
* @param autofillHint The autofill hint to set. If the array is emtpy, {@code null} is set.
* @attr ref android.R.styleable#View_autofillHint
*/
public void setAutofillHint(@AutofillHint int autofillHint) {
mAutofillHint = autofillHint;
public void setAutofillHint(@Nullable String... autofillHint) {
if (autofillHint == null || autofillHint.length == 0) {
mAutofillHint = null;
} else {
mAutofillHint = autofillHint;
}
}
/**

3
core/java/android/view/ViewStructure.java
View File

@@ -16,6 +16,7 @@
package android.view;
import android.annotation.Nullable;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.os.Bundle;
@@ -323,7 +324,7 @@ public abstract class ViewStructure {
* Sets the a hint that helps the autofill service to select the appropriate data to fill the
* view.
*/
public abstract void setAutofillHint(@View.AutofillHint int hint);
public abstract void setAutofillHint(@Nullable String[] hint);
/**
* Sets the {@link AutofillValue} representing the current value of this node.