Merge "Created SaveInfo types for email and username." into oc-dev (ff43ec44) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -37067,8 +37067,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 {

+2 −0

Original line number	Diff line number	Diff line
		@@ -40129,8 +40129,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 {

+2 −0

Original line number	Diff line number	Diff line
		@@ -37225,8 +37225,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 {

+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:

+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>