Merge "Add flag to know if custom shape is being used vs default shape" into main (bc4f5a83) · Commits · e / os / android_frameworks_libs_systemui

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ data class BitmapInfo(
		)
		internal annotation class BitmapInfoFlags

		@IntDef(flag = true, value = [FLAG_THEMED, FLAG_NO_BADGE, FLAG_SKIP_USER_BADGE])
		@IntDef(flag = true, value = [FLAG_THEMED, FLAG_NO_BADGE, FLAG_SKIP_USER_BADGE, FLAG_CUSTOM_SHAPE])
		annotation class DrawableCreationFlags

		fun withBadgeInfo(badgeInfo: BitmapInfo?) = copy(badgeInfo = badgeInfo)
		@@ -104,7 +104,11 @@ data class BitmapInfo(
		else -> delegateFactory
		},
		disabledAlpha = GraphicsUtils.getFloat(context, R.attr.disabledIconAlpha, 1f),
		creationFlags = creationFlags,
		creationFlags = if (iconShape != null) {
		creationFlags.or(FLAG_CUSTOM_SHAPE)
		} else {
		creationFlags
		},
		badge =
		if (!creationFlags.hasMask(FLAG_NO_BADGE)) {
		getBadgeDrawable(
		@@ -211,6 +215,7 @@ data class BitmapInfo(
		const val FLAG_THEMED: Int = 1 shl 0
		const val FLAG_NO_BADGE: Int = 1 shl 1
		const val FLAG_SKIP_USER_BADGE: Int = 1 shl 2
		const val FLAG_CUSTOM_SHAPE: Int = 1 shl 3

		@JvmField val LOW_RES_ICON: Bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8)
		@JvmField val LOW_RES_INFO: BitmapInfo = fromBitmap(LOW_RES_ICON)