Merge "Revert "[RONs] Define Progress Thumb Icon for EnRouteStyle"" into main (fd66333c) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −44

Original line number	Diff line number	Diff line
		@@ -1593,17 +1593,6 @@ public class Notification implements Parcelable
		*/
		@FlaggedApi(Flags.FLAG_API_RICH_ONGOING)
		public static final String EXTRA_ENROUTE_LARGE_ICON_SUBTEXT = "android.enrouteLargeIconSubText";

		/**
		* {@link #extras} key: {@link Icon} of an image used as a thumb icon on
		* {@link Notification} progress bar for {@link EnRouteStyle} notifications.
		* This extra is an {@code Icon}.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_API_RICH_ONGOING)
		public static final String EXTRA_ENROUTE_PROGRESS_THUMB_ICON =
		"android.enrouteProgressThumbIcon";

		/**
		* {@link #extras} key: whether the notification should be colorized as
		* supplied to {@link Builder#setColorized(boolean)}.
		@@ -3063,8 +3052,6 @@ public class Notification implements Parcelable

		if (Flags.apiRichOngoing()) {
		visitIconUri(visitor, extras.getParcelable(EXTRA_ENROUTE_OVERLAY_ICON, Icon.class));
		visitIconUri(visitor, extras.getParcelable(EXTRA_ENROUTE_PROGRESS_THUMB_ICON,
		Icon.class));
		}

		if (mBubbleMetadata != null) {
		@@ -11028,9 +11015,6 @@ public class Notification implements Parcelable
		@Nullable
		private CharSequence mLargeIconSubText = null;

		@Nullable
		private Icon mProgressThumbIcon = null;

		public EnRouteStyle() {
		}

		@@ -11074,25 +11058,6 @@ public class Notification implements Parcelable
		return this;
		}

		/**
		* Returns the progress thumb icon.
		* @see EnRouteStyle#setProgressThumbIcon
		*/
		@Nullable
		public Icon getProgressThumbIcon() {
		return mProgressThumbIcon;
		}

		/**
		* Optional icon to be used as a progress thumb.
		*/
		@NonNull
		public EnRouteStyle setProgressThumbIcon(@Nullable Icon progressThumbIcon) {
		mProgressThumbIcon = progressThumbIcon;
		return this;
		}


		/**
		* @hide
		*/
		@@ -11104,8 +11069,7 @@ public class Notification implements Parcelable

		final EnRouteStyle enRouteStyle = (EnRouteStyle) other;
		return !Objects.equals(mOverlayIcon, enRouteStyle.mOverlayIcon)
		\|\| !Objects.equals(mLargeIconSubText, enRouteStyle.mLargeIconSubText)
		\|\| !Objects.equals(mProgressThumbIcon, enRouteStyle.mProgressThumbIcon);
		\|\| !Objects.equals(mLargeIconSubText, enRouteStyle.mLargeIconSubText);
		}

		/**
		@@ -11116,7 +11080,6 @@ public class Notification implements Parcelable
		super.addExtras(extras);
		extras.putParcelable(EXTRA_ENROUTE_OVERLAY_ICON, mOverlayIcon);
		extras.putCharSequence(EXTRA_ENROUTE_LARGE_ICON_SUBTEXT, mLargeIconSubText);
		extras.putParcelable(EXTRA_ENROUTE_PROGRESS_THUMB_ICON, mProgressThumbIcon);
		}

		/**
		@@ -11127,8 +11090,6 @@ public class Notification implements Parcelable
		super.restoreFromExtras(extras);
		mOverlayIcon = extras.getParcelable(EXTRA_ENROUTE_OVERLAY_ICON, Icon.class);
		mLargeIconSubText = extras.getCharSequence(EXTRA_ENROUTE_LARGE_ICON_SUBTEXT);
		mProgressThumbIcon =
		extras.getParcelable(EXTRA_ENROUTE_PROGRESS_THUMB_ICON, Icon.class);
		}

		/**
		@@ -11140,10 +11101,6 @@ public class Notification implements Parcelable
		if (mOverlayIcon != null) {
		mOverlayIcon.convertToAshmem();
		}

		if (mProgressThumbIcon != null) {
		mProgressThumbIcon.convertToAshmem();
		}
		}

		/**