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

Commit f9005f54 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/34330462'] into 25Q4-release. 

Change-Id: Ic1071fd8ca9354d490f8b4cabd15d90bb90bcfd4
parents beb68008 ca4060ec

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

0 → 100644
+760 −0

File added.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −521

File deleted.

Preview size limit exceeded, changes collapsed.

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

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ data class BitmapInfo( 
    fun withFlags(op: FlagOp): BitmapInfo =

        if (op === FlagOp.NO_OP) this else copy(flags = op.apply(this.flags))



    /** Helper class to allow copy from java code */

    fun withThemedBitmap(themedBitmap: ThemedBitmap?) = copy(themedBitmap = themedBitmap)



    val isLowRes: Boolean

        get() = matchingLookupFlag.useLowRes()

iconloaderlib/src/com/android/launcher3/icons/BubbleIconFactory.java

+5 −7
Original line number Diff line number Diff line
@@ -74,13 +74,11 @@ public class BubbleIconFactory extends BaseIconFactory { 
     * drawing the actual drawable. This is used for the larger icon shown for the bubble.

     */

    public Bitmap getBubbleBitmap(@NonNull Drawable icon, float[] outScale) {

        if (outScale != null) {

            outScale[0] = IconNormalizer.ICON_VISIBLE_AREA_FACTOR;

        if (outScale == null) {

            outScale = new float[1];

        }

        return createIconBitmap(

                wrapToAdaptiveIcon(icon),

                IconNormalizer.ICON_VISIBLE_AREA_FACTOR,

                MODE_WITH_SHADOW);

        icon = normalizeAndWrapToAdaptiveIcon(icon, outScale);

        return createIconBitmap(icon, outScale[0], MODE_WITH_SHADOW, mDrawFullBleedIcons);

    }



    /**
@@ -97,7 +95,7 @@ public class BubbleIconFactory extends BaseIconFactory { 
            userBadgedAppIcon = new CircularRingDrawable(userBadgedAppIcon);

        }

        Bitmap userBadgedBitmap = mBadgeFactory.createIconBitmap(

                userBadgedAppIcon, 1, MODE_WITH_SHADOW);

                userBadgedAppIcon, 1, MODE_WITH_SHADOW, mDrawFullBleedIcons);

        return mBadgeFactory.createIconBitmap(userBadgedBitmap);

    }

iconloaderlib/src/com/android/launcher3/icons/mono/MonoIconThemeController.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.graphics.drawable.LayerDrawable 
import android.os.Build

import com.android.launcher3.Flags

import com.android.launcher3.icons.BaseIconFactory

import com.android.launcher3.icons.BaseIconFactory.Companion.MODE_ALPHA

import com.android.launcher3.icons.BaseIconFactory.MODE_ALPHA

import com.android.launcher3.icons.BitmapInfo

import com.android.launcher3.icons.ClockDrawableWrapper.ClockAnimationInfo

import com.android.launcher3.icons.IconThemeController