Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7459b581 authored by Charlie Anderson's avatar Charlie Anderson
Browse files

Add flag to know if custom shape is being used vs default shape 

Bug: 427282649
Test: launching and backing out of apps both on workspace and all apps
Flag: com.android.launcher3.enable_launcher_icon_shapes
Change-Id: Id68bfeebf2103a4633eec25ec87f15a80b0ba4e2
parent 89f447db

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)