Merge "Remove mentions of the small icon appearing in the content view" into main (7c100324) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -4541,7 +4541,7 @@ public class Notification implements Parcelable
		}

		/**
		* The small icon representing this notification in the status bar and content view.
		* The small icon representing this notification in the status bar.
		*
		* @return the small icon representing this notification
		*
		@@ -5089,8 +5089,7 @@ public class Notification implements Parcelable

		/**
		* Set the small icon, which will be used to represent the notification in the
		* status bar and content view (unless overridden there by a
		* {@link #setLargeIcon(Bitmap) large icon}).
		* status bar.
		*
		* @param icon an Icon object to use
		* @see Notification#icon
		@@ -5471,8 +5470,8 @@ public class Notification implements Parcelable
		* Add a large icon to the notification content view.
		*
		* <p>In the platform template, this image will be shown either on the right of the
		* notification, with an aspect ratio of up to 16:9, or (when the notification is grouped)
		* on the left in place of the {@link #setSmallIcon(Icon) small icon}.
		* notification, with an aspect ratio of up to 16:9, or on the left when the notification
		* is grouped.
		*/
		@NonNull
		public Builder setLargeIcon(Bitmap b) {
		@@ -5483,8 +5482,8 @@ public class Notification implements Parcelable
		* Add a large icon to the notification content view.
		*
		* <p>In the platform template, this image will be shown either on the right of the
		* notification, with an aspect ratio of up to 16:9, or (when the notification is grouped)
		* on the left in place of the {@link #setSmallIcon(Icon) small icon}.
		* notification, with an aspect ratio of up to 16:9, or on the left when the notification
		* is grouped.
		*/
		@NonNull
		public Builder setLargeIcon(Icon icon) {