Merge "Change autoFillHint to list of strings" (37bf8b17) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −18

Original line number	Diff line number	Diff line
		@@ -6566,7 +6566,7 @@ package android.app.assist {

		public static class AssistStructure.ViewNode {
		method public float getAlpha();
		method public int getAutoFillHint();
		method public java.lang.String[] getAutoFillHint();
		method public android.view.autofill.AutofillId getAutofillId();
		method public java.lang.String[] getAutofillOptions();
		method public int getAutofillType();
		@@ -45098,7 +45098,7 @@ package android.view {
		method public float getAlpha();
		method public android.view.animation.Animation getAnimation();
		method public android.os.IBinder getApplicationWindowToken();
		method public int getAutofillHint();
		method public java.lang.String[] getAutofillHint();
		method public int getAutofillMode();
		method public int getAutofillType();
		method public android.view.autofill.AutofillValue getAutofillValue();
		@@ -45419,7 +45419,7 @@ package android.view {
		method public void setActivated(boolean);
		method public void setAlpha(float);
		method public void setAnimation(android.view.animation.Animation);
		method public void setAutofillHint(int);
		method public void setAutofillHint(java.lang.String[]);
		method public void setAutofillMode(int);
		method public void setBackground(android.graphics.drawable.Drawable);
		method public void setBackgroundColor(int);
		@@ -45562,20 +45562,19 @@ package android.view {
		field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
		field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
		field public static final android.util.Property<android.view.View, java.lang.Float> ALPHA;
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = 512; // 0x200
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = 4096; // 0x1000
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = 1024; // 0x400
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = 2048; // 0x800
		field public static final int AUTOFILL_HINT_CREDIT_CARD_NUMBER = 128; // 0x80
		field public static final int AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = 256; // 0x100
		field public static final int AUTOFILL_HINT_EMAIL_ADDRESS = 1; // 0x1
		field public static final int AUTOFILL_HINT_NAME = 2; // 0x2
		field public static final int AUTOFILL_HINT_NONE = 0; // 0x0
		field public static final int AUTOFILL_HINT_PASSWORD = 8; // 0x8
		field public static final int AUTOFILL_HINT_PHONE = 16; // 0x10
		field public static final int AUTOFILL_HINT_POSTAL_ADDRESS = 32; // 0x20
		field public static final int AUTOFILL_HINT_POSTAL_CODE = 64; // 0x40
		field public static final int AUTOFILL_HINT_USERNAME = 4; // 0x4
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = "creditCardExpirationDate";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = "creditCardExpirationDay";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = "creditCardExpirationMonth";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = "creditCardExpirationYear";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_NUMBER = "creditCardNumber";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = "creditCardSecurityCode";
		field public static final java.lang.String AUTOFILL_HINT_EMAIL_ADDRESS = "emailAddress";
		field public static final java.lang.String AUTOFILL_HINT_NAME = "name";
		field public static final java.lang.String AUTOFILL_HINT_PASSWORD = "password";
		field public static final java.lang.String AUTOFILL_HINT_PHONE = "phone";
		field public static final java.lang.String AUTOFILL_HINT_POSTAL_ADDRESS = "postalAddress";
		field public static final java.lang.String AUTOFILL_HINT_POSTAL_CODE = "postalCode";
		field public static final java.lang.String AUTOFILL_HINT_USERNAME = "username";
		field public static final int AUTOFILL_MODE_AUTO = 1; // 0x1
		field public static final int AUTOFILL_MODE_INHERIT = 0; // 0x0
		field public static final int AUTOFILL_MODE_MANUAL = 2; // 0x2
		@@ -46237,7 +46236,7 @@ package android.view {
		method public abstract void setAccessibilityFocused(boolean);
		method public abstract void setActivated(boolean);
		method public abstract void setAlpha(float);
		method public abstract void setAutofillHint(int);
		method public abstract void setAutofillHint(java.lang.String[]);
		method public abstract void setAutofillOptions(java.lang.String[]);
		method public abstract void setAutofillType(int);
		method public abstract void setAutofillValue(android.view.autofill.AutofillValue);

api/system-current.txt

+17 −18

Original line number	Diff line number	Diff line
		@@ -6816,7 +6816,7 @@ package android.app.assist {

		public static class AssistStructure.ViewNode {
		method public float getAlpha();
		method public int getAutoFillHint();
		method public java.lang.String[] getAutoFillHint();
		method public android.view.autofill.AutofillId getAutofillId();
		method public java.lang.String[] getAutofillOptions();
		method public int getAutofillType();
		@@ -48557,7 +48557,7 @@ package android.view {
		method public float getAlpha();
		method public android.view.animation.Animation getAnimation();
		method public android.os.IBinder getApplicationWindowToken();
		method public int getAutofillHint();
		method public java.lang.String[] getAutofillHint();
		method public int getAutofillMode();
		method public int getAutofillType();
		method public android.view.autofill.AutofillValue getAutofillValue();
		@@ -48878,7 +48878,7 @@ package android.view {
		method public void setActivated(boolean);
		method public void setAlpha(float);
		method public void setAnimation(android.view.animation.Animation);
		method public void setAutofillHint(int);
		method public void setAutofillHint(java.lang.String[]);
		method public void setAutofillMode(int);
		method public void setBackground(android.graphics.drawable.Drawable);
		method public void setBackgroundColor(int);
		@@ -49021,20 +49021,19 @@ package android.view {
		field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
		field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
		field public static final android.util.Property<android.view.View, java.lang.Float> ALPHA;
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = 512; // 0x200
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = 4096; // 0x1000
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = 1024; // 0x400
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = 2048; // 0x800
		field public static final int AUTOFILL_HINT_CREDIT_CARD_NUMBER = 128; // 0x80
		field public static final int AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = 256; // 0x100
		field public static final int AUTOFILL_HINT_EMAIL_ADDRESS = 1; // 0x1
		field public static final int AUTOFILL_HINT_NAME = 2; // 0x2
		field public static final int AUTOFILL_HINT_NONE = 0; // 0x0
		field public static final int AUTOFILL_HINT_PASSWORD = 8; // 0x8
		field public static final int AUTOFILL_HINT_PHONE = 16; // 0x10
		field public static final int AUTOFILL_HINT_POSTAL_ADDRESS = 32; // 0x20
		field public static final int AUTOFILL_HINT_POSTAL_CODE = 64; // 0x40
		field public static final int AUTOFILL_HINT_USERNAME = 4; // 0x4
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = "creditCardExpirationDate";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = "creditCardExpirationDay";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = "creditCardExpirationMonth";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = "creditCardExpirationYear";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_NUMBER = "creditCardNumber";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = "creditCardSecurityCode";
		field public static final java.lang.String AUTOFILL_HINT_EMAIL_ADDRESS = "emailAddress";
		field public static final java.lang.String AUTOFILL_HINT_NAME = "name";
		field public static final java.lang.String AUTOFILL_HINT_PASSWORD = "password";
		field public static final java.lang.String AUTOFILL_HINT_PHONE = "phone";
		field public static final java.lang.String AUTOFILL_HINT_POSTAL_ADDRESS = "postalAddress";
		field public static final java.lang.String AUTOFILL_HINT_POSTAL_CODE = "postalCode";
		field public static final java.lang.String AUTOFILL_HINT_USERNAME = "username";
		field public static final int AUTOFILL_MODE_AUTO = 1; // 0x1
		field public static final int AUTOFILL_MODE_INHERIT = 0; // 0x0
		field public static final int AUTOFILL_MODE_MANUAL = 2; // 0x2
		@@ -49696,7 +49695,7 @@ package android.view {
		method public abstract void setAccessibilityFocused(boolean);
		method public abstract void setActivated(boolean);
		method public abstract void setAlpha(float);
		method public abstract void setAutofillHint(int);
		method public abstract void setAutofillHint(java.lang.String[]);
		method public abstract void setAutofillOptions(java.lang.String[]);
		method public abstract void setAutofillType(int);
		method public abstract void setAutofillValue(android.view.autofill.AutofillValue);

api/test-current.txt

+17 −18

Original line number	Diff line number	Diff line
		@@ -6593,7 +6593,7 @@ package android.app.assist {

		public static class AssistStructure.ViewNode {
		method public float getAlpha();
		method public int getAutoFillHint();
		method public java.lang.String[] getAutoFillHint();
		method public android.view.autofill.AutofillId getAutofillId();
		method public java.lang.String[] getAutofillOptions();
		method public int getAutofillType();
		@@ -45458,7 +45458,7 @@ package android.view {
		method public float getAlpha();
		method public android.view.animation.Animation getAnimation();
		method public android.os.IBinder getApplicationWindowToken();
		method public int getAutofillHint();
		method public java.lang.String[] getAutofillHint();
		method public int getAutofillMode();
		method public int getAutofillType();
		method public android.view.autofill.AutofillValue getAutofillValue();
		@@ -45782,7 +45782,7 @@ package android.view {
		method public void setActivated(boolean);
		method public void setAlpha(float);
		method public void setAnimation(android.view.animation.Animation);
		method public void setAutofillHint(int);
		method public void setAutofillHint(java.lang.String[]);
		method public void setAutofillMode(int);
		method public void setBackground(android.graphics.drawable.Drawable);
		method public void setBackgroundColor(int);
		@@ -45925,20 +45925,19 @@ package android.view {
		field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
		field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
		field public static final android.util.Property<android.view.View, java.lang.Float> ALPHA;
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = 512; // 0x200
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = 4096; // 0x1000
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = 1024; // 0x400
		field public static final int AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = 2048; // 0x800
		field public static final int AUTOFILL_HINT_CREDIT_CARD_NUMBER = 128; // 0x80
		field public static final int AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = 256; // 0x100
		field public static final int AUTOFILL_HINT_EMAIL_ADDRESS = 1; // 0x1
		field public static final int AUTOFILL_HINT_NAME = 2; // 0x2
		field public static final int AUTOFILL_HINT_NONE = 0; // 0x0
		field public static final int AUTOFILL_HINT_PASSWORD = 8; // 0x8
		field public static final int AUTOFILL_HINT_PHONE = 16; // 0x10
		field public static final int AUTOFILL_HINT_POSTAL_ADDRESS = 32; // 0x20
		field public static final int AUTOFILL_HINT_POSTAL_CODE = 64; // 0x40
		field public static final int AUTOFILL_HINT_USERNAME = 4; // 0x4
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = "creditCardExpirationDate";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = "creditCardExpirationDay";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = "creditCardExpirationMonth";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = "creditCardExpirationYear";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_NUMBER = "creditCardNumber";
		field public static final java.lang.String AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = "creditCardSecurityCode";
		field public static final java.lang.String AUTOFILL_HINT_EMAIL_ADDRESS = "emailAddress";
		field public static final java.lang.String AUTOFILL_HINT_NAME = "name";
		field public static final java.lang.String AUTOFILL_HINT_PASSWORD = "password";
		field public static final java.lang.String AUTOFILL_HINT_PHONE = "phone";
		field public static final java.lang.String AUTOFILL_HINT_POSTAL_ADDRESS = "postalAddress";
		field public static final java.lang.String AUTOFILL_HINT_POSTAL_CODE = "postalCode";
		field public static final java.lang.String AUTOFILL_HINT_USERNAME = "username";
		field public static final int AUTOFILL_MODE_AUTO = 1; // 0x1
		field public static final int AUTOFILL_MODE_INHERIT = 0; // 0x0
		field public static final int AUTOFILL_MODE_MANUAL = 2; // 0x2
		@@ -46604,7 +46603,7 @@ package android.view {
		method public abstract void setAccessibilityFocused(boolean);
		method public abstract void setActivated(boolean);
		method public abstract void setAlpha(float);
		method public abstract void setAutofillHint(int);
		method public abstract void setAutofillHint(java.lang.String[]);
		method public abstract void setAutofillOptions(java.lang.String[]);
		method public abstract void setAutofillType(int);
		method public abstract void setAutofillValue(android.view.autofill.AutofillValue);

core/java/android/app/assist/AssistStructure.java

+7 −6

Original line number	Diff line number	Diff line
		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());
		}

core/java/android/view/View.java

+90 −75

File changed.

Preview size limit exceeded, changes collapsed.