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

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

Snap for 13097162 from d015ca58 to 25Q2-release

Change-Id: If4b4626f53a67a30dae4c2273a839ae731621a5f
parents 320e4583 d015ca58
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -59,4 +59,5 @@ data class SourceHint(
    val key: ComponentKey,
    val logic: CachingLogic<*>,
    val freshnessId: String? = null,
    val isFileDrawable: Boolean = false,
)
+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ constructor(
            ComponentKey(ComponentName(packageName, packageName + EMPTY_CLASS_NAME), user)

        // Ensures themed bitmaps in the icon cache are invalidated
        @JvmField val RELEASE_VERSION = if (Flags.forceMonochromeAppIcons()) 6 else 5
        @JvmField val RELEASE_VERSION = if (Flags.forceMonochromeAppIcons()) 8 else 7

        @JvmField val TABLE_NAME = "icons"
        @JvmField val COLUMN_ROWID = "rowid"
+7 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class MonoIconThemeController(
        factory: BaseIconFactory,
        sourceHint: SourceHint?,
    ): ThemedBitmap? {
        val mono = getMonochromeDrawable(icon, info)
        val mono = getMonochromeDrawable(icon, info, sourceHint?.isFileDrawable ?: false)
        if (mono != null) {
            return MonoThemedBitmap(
                factory.createIconBitmap(mono, ICON_VISIBLE_AREA_FACTOR, MODE_ALPHA),
@@ -71,12 +71,16 @@ class MonoIconThemeController(
     *
     * @param base the original icon
     */
    private fun getMonochromeDrawable(base: AdaptiveIconDrawable, info: BitmapInfo): Drawable? {
    private fun getMonochromeDrawable(
        base: AdaptiveIconDrawable,
        info: BitmapInfo,
        isFileDrawable: Boolean,
    ): Drawable? {
        val mono = base.monochrome
        if (mono != null) {
            return ClippedMonoDrawable(mono)
        }
        if (Flags.forceMonochromeAppIcons()) {
        if (Flags.forceMonochromeAppIcons() && !isFileDrawable) {
            return MonochromeIconFactory(info.icon.width).wrap(base)
        }
        return null
+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ private object PerfettoTraceConfig {

    init {
        if (android.os.Flags.perfettoSdkTracingV2()) {
            PerfettoTrace.register(/* isBackendInProcess */ false)
            COROUTINE_CATEGORY.register()
        }
    }