Always have the current iconShape in BaseIconFactory irrespective of full-bleed setting.

This change was lost when resolving merge conflict

Bug: 427109551
Flag: EXEMPT bugfix
Test: Verified manually on device
Change-Id: I3b30700efe54b1820d0fe0383250a837b0f30292

parent cde07e42

iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.kt

+6 −8

Original line number	Diff line number	Diff line
		@@ -83,8 +83,6 @@ constructor(

		/** Default IconShape for when custom shape is not needed */
		val defaultIconShape: IconShape by lazy {
		if (!drawFullBleedIcons) IconShape.EMPTY
		else
		generateIconShape(
		iconBitmapSize,
		AdaptiveIconDrawable(ColorDrawable(Color.BLACK), null)