Merge "Rename PromptContentListItem to PromptContentItem." into main (7248d578) · Commits · e / os / android_frameworks_base

core/api/current.txt

+10 −9

Original line number	Diff line number	Diff line
		@@ -18753,21 +18753,21 @@ package android.hardware.biometrics {
		method @Nullable public java.security.Signature getSignature();
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public interface PromptContentListItem {
		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public interface PromptContentItem {
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptContentListItemBulletedText implements android.os.Parcelable android.hardware.biometrics.PromptContentListItem {
		ctor public PromptContentListItemBulletedText(@NonNull CharSequence);
		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptContentItemBulletedText implements android.os.Parcelable android.hardware.biometrics.PromptContentItem {
		ctor public PromptContentItemBulletedText(@NonNull CharSequence);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.biometrics.PromptContentListItemBulletedText> CREATOR;
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.biometrics.PromptContentItemBulletedText> CREATOR;
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptContentListItemPlainText implements android.os.Parcelable android.hardware.biometrics.PromptContentListItem {
		ctor public PromptContentListItemPlainText(@NonNull CharSequence);
		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptContentItemPlainText implements android.os.Parcelable android.hardware.biometrics.PromptContentItem {
		ctor public PromptContentItemPlainText(@NonNull CharSequence);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.biometrics.PromptContentListItemPlainText> CREATOR;
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.biometrics.PromptContentItemPlainText> CREATOR;
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public interface PromptContentView {
		@@ -18776,7 +18776,7 @@ package android.hardware.biometrics {
		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptVerticalListContentView implements android.os.Parcelable android.hardware.biometrics.PromptContentView {
		method public int describeContents();
		method @Nullable public CharSequence getDescription();
		method @NonNull public java.util.List<android.hardware.biometrics.PromptContentListItem> getListItems();
		method @NonNull public java.util.List<android.hardware.biometrics.PromptContentItem> getListItems();
		method public static int getMaxEachItemCharacterNumber();
		method public static int getMaxItemCount();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -18785,7 +18785,8 @@ package android.hardware.biometrics {

		public static final class PromptVerticalListContentView.Builder {
		ctor public PromptVerticalListContentView.Builder();
		method @NonNull public android.hardware.biometrics.PromptVerticalListContentView.Builder addListItem(@NonNull android.hardware.biometrics.PromptContentListItem);
		method @NonNull public android.hardware.biometrics.PromptVerticalListContentView.Builder addListItem(@NonNull android.hardware.biometrics.PromptContentItem);
		method @NonNull public android.hardware.biometrics.PromptVerticalListContentView.Builder addListItem(@NonNull android.hardware.biometrics.PromptContentItem, int);
		method @NonNull public android.hardware.biometrics.PromptVerticalListContentView build();
		method @NonNull public android.hardware.biometrics.PromptVerticalListContentView.Builder setDescription(@NonNull CharSequence);
		}

core/java/android/hardware/biometrics/PromptContentListItem.java→core/java/android/hardware/biometrics/PromptContentItem.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ import static android.hardware.biometrics.Flags.FLAG_CUSTOM_BIOMETRIC_PROMPT;
		import android.annotation.FlaggedApi;

		/**
		* A list item shown on {@link PromptVerticalListContentView}.
		* An item shown on {@link PromptContentView}.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		public interface PromptContentListItem {
		public interface PromptContentItem {
		}

core/java/android/hardware/biometrics/PromptContentListItemBulletedText.java→core/java/android/hardware/biometrics/PromptContentItemBulletedText.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import android.os.Parcelable;
		* A list item with bulleted text shown on {@link PromptVerticalListContentView}.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		public final class PromptContentListItemBulletedText implements PromptContentListItemParcelable {
		public final class PromptContentItemBulletedText implements PromptContentItemParcelable {
		private final CharSequence mText;

		/**
		@@ -35,7 +35,7 @@ public final class PromptContentListItemBulletedText implements PromptContentLis
		*
		* @param text The text of this list item.
		*/
		public PromptContentListItemBulletedText(@NonNull CharSequence text) {
		public PromptContentItemBulletedText(@NonNull CharSequence text) {
		mText = text;
		}

		@@ -67,15 +67,15 @@ public final class PromptContentListItemBulletedText implements PromptContentLis
		* @see Parcelable.Creator
		*/
		@NonNull
		public static final Creator<PromptContentListItemBulletedText> CREATOR = new Creator<>() {
		public static final Creator<PromptContentItemBulletedText> CREATOR = new Creator<>() {
		@Override
		public PromptContentListItemBulletedText createFromParcel(Parcel in) {
		return new PromptContentListItemBulletedText(in.readCharSequence());
		public PromptContentItemBulletedText createFromParcel(Parcel in) {
		return new PromptContentItemBulletedText(in.readCharSequence());
		}

		@Override
		public PromptContentListItemBulletedText[] newArray(int size) {
		return new PromptContentListItemBulletedText[size];
		public PromptContentItemBulletedText[] newArray(int size) {
		return new PromptContentItemBulletedText[size];
		}
		};
		}

core/java/android/hardware/biometrics/PromptContentListItemParcelable.java→core/java/android/hardware/biometrics/PromptContentItemParcelable.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@ import android.annotation.FlaggedApi;
		import android.os.Parcelable;

		/**
		* A parcelable {@link PromptContentListItem}.
		* A parcelable {@link PromptContentItem}.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		sealed interface PromptContentListItemParcelable extends PromptContentListItem, Parcelable
		permits PromptContentListItemPlainText, PromptContentListItemBulletedText {
		sealed interface PromptContentItemParcelable extends PromptContentItem, Parcelable
		permits PromptContentItemPlainText, PromptContentItemBulletedText {
		}

core/java/android/hardware/biometrics/PromptContentListItemPlainText.java→core/java/android/hardware/biometrics/PromptContentItemPlainText.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import android.os.Parcelable;
		* A list item with plain text shown on {@link PromptVerticalListContentView}.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		public final class PromptContentListItemPlainText implements PromptContentListItemParcelable {
		public final class PromptContentItemPlainText implements PromptContentItemParcelable {
		private final CharSequence mText;

		/**
		@@ -35,7 +35,7 @@ public final class PromptContentListItemPlainText implements PromptContentListIt
		*
		* @param text The text of this list item.
		*/
		public PromptContentListItemPlainText(@NonNull CharSequence text) {
		public PromptContentItemPlainText(@NonNull CharSequence text) {
		mText = text;
		}

		@@ -67,15 +67,15 @@ public final class PromptContentListItemPlainText implements PromptContentListIt
		* @see Parcelable.Creator
		*/
		@NonNull
		public static final Creator<PromptContentListItemPlainText> CREATOR = new Creator<>() {
		public static final Creator<PromptContentItemPlainText> CREATOR = new Creator<>() {
		@Override
		public PromptContentListItemPlainText createFromParcel(Parcel in) {
		return new PromptContentListItemPlainText(in.readCharSequence());
		public PromptContentItemPlainText createFromParcel(Parcel in) {
		return new PromptContentItemPlainText(in.readCharSequence());
		}

		@Override
		public PromptContentListItemPlainText[] newArray(int size) {
		return new PromptContentListItemPlainText[size];
		public PromptContentItemPlainText[] newArray(int size) {
		return new PromptContentItemPlainText[size];
		}
		};
		}