Snap for 13697098 from 3de17107d048111a7b970a300b20dafa73c59ec9 to 25Q4-release (5dcd72d8) · Commits · e / os / android_frameworks_libs_systemui

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,7 @@ public class BaseIconFactory implements AutoCloseable {
		* Generates an IconShape based on the current bitmap size and default icon mask.
		*/
		public IconShape getDefaultIconShape() {
		if (!mDrawFullBleedIcons) return IconShape.EMPTY;
		if (mDefaultIconShape != null) return mDefaultIconShape;
		AdaptiveIconDrawable tempAdaptiveIcon =
		new AdaptiveIconDrawable(new ColorDrawable(BLACK), null);

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

+16 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package com.android.launcher3.icons
		import android.content.Context
		import android.graphics.Bitmap
		import android.graphics.Bitmap.CompressFormat.PNG
		import android.graphics.BitmapFactory
		import android.graphics.BitmapFactory.Options
		import android.graphics.BlendMode
		import android.graphics.BlendModeColorFilter
		import android.graphics.Canvas
		@@ -35,7 +37,6 @@ import android.graphics.RegionIterator
		import android.util.Log
		import androidx.annotation.ColorInt
		import androidx.core.graphics.ColorUtils.compositeColors
		import com.android.launcher3.icons.GraphicsUtils.resize
		import com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR
		import com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR
		import java.io.ByteArrayOutputStream
		@@ -73,6 +74,20 @@ object GraphicsUtils {
		}
		}

		/** Tries to decode the [ByteArray] into a [Bitmap] consuming any parsing errors */
		fun ByteArray.parseBitmapSafe(config: Bitmap.Config): Bitmap? =
		try {
		BitmapFactory.decodeByteArray(
		/* data= */ this,
		/* offset= */ 0,
		/* length= */ size,
		Options().apply { inPreferredConfig = config },
		)
		} catch (e: Exception) {
		Log.e(TAG, "Error parsing persisted bitmap", e)
		null
		}

		/**
		* Try go guesstimate how much space the icon will take when serialized to avoid unnecessary
		* allocations/copies during the write (4 bytes per pixel).

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ interface IconThemeController {
		): ThemedBitmap

		fun decode(
		data: ByteArray,
		bytes: ByteArray,
		info: BitmapInfo,
		factory: BaseIconFactory,
		sourceHint: SourceHint,

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.kt

+26 −39

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import android.content.pm.LauncherApps
		import android.content.pm.PackageManager
		import android.content.pm.PackageManager.NameNotFoundException
		import android.database.Cursor
		import android.database.sqlite.SQLiteDatabase
		import android.database.sqlite.SQLiteException
		import android.database.sqlite.SQLiteReadOnlyDatabaseException
		import android.graphics.Bitmap
		import android.graphics.Bitmap.Config.HARDWARE
		@@ -93,7 +91,7 @@ constructor(

		@JvmField val workerHandler = Handler(bgLooper)

		@JvmField protected var iconDb = IconDB(context, dbFileName, iconPixelSize)
		@JvmField protected var iconDb = createIconDb(iconPixelSize)

		private var defaultIcon: BitmapInfo? = null
		private val userFlagOpMap = SparseArray<FlagOp>()
		@@ -133,7 +131,7 @@ constructor(
		userFlagOpMap.clear()
		iconDb.clear()
		iconDb.close()
		iconDb = IconDB(context, dbFileName, iconPixelSize)
		iconDb = createIconDb(iconPixelSize)
		cache.clear()
		} catch (e: SQLiteReadOnlyDatabaseException) {
		// This is known to happen during repeated backup and restores, if the Launcher is in
		@@ -486,28 +484,22 @@ constructor(
		lookupFlags: CacheLookupFlag,
		cachingLogic: CachingLogic<*>,
		): Boolean {
		var c: Cursor? = null
		Trace.beginSection("loadIconIndividually")
		try {
		c =
		iconDb.query(
		return iconDb.querySingleEntry(
		lookupFlags.toLookupColumns(),
		"$COLUMN_COMPONENT = ? AND $COLUMN_USER = ?",
		arrayOf(
		cacheKey.componentName.flattenToString(),
		getSerialNumberForUser(cacheKey.user).toString(),
		),
		)
		if (c.moveToNext()) {
		return updateTitleAndIconLocked(cacheKey, entry, c, lookupFlags, cachingLogic)
		false,
		) {
		updateTitleAndIconLocked(cacheKey, entry, it, lookupFlags, cachingLogic)
		}
		} catch (e: SQLiteException) {
		Log.d(TAG, "Error reading icon cache", e)
		} finally {
		c?.close()
		Trace.endSection()
		}
		return false
		}

		private fun updateTitleAndIconLocked(
		@@ -561,7 +553,7 @@ constructor(
		if (themeController != null && monoIconData != null) {
		entry.bitmap.themedBitmap =
		themeController.decode(
		data = monoIconData,
		bytes = monoIconData,
		info = entry.bitmap,
		factory = factory,
		sourceHint =
		@@ -614,18 +606,15 @@ constructor(
		Log.d(TAG, message, e)
		}

		/** Cache class to store the actual entries on disk */
		class IconDB(context: Context, dbFileName: String?, iconPixelSize: Int) :
		/** Creates a cache class to store the actual entries on disk */
		private fun createIconDb(iconPixelSize: Int) =
		SQLiteCacheHelper(
		context,
		dbFileName,
		(RELEASE_VERSION shl 16) + iconPixelSize,
		TABLE_NAME,
		) {

		override fun onCreateTable(db: SQLiteDatabase) {
		db.execSQL(
		("CREATE TABLE IF NOT EXISTS $TABLE_NAME (" +
		"CREATE TABLE IF NOT EXISTS $TABLE_NAME (" +
		"$COLUMN_COMPONENT TEXT NOT NULL, " +
		"$COLUMN_USER INTEGER NOT NULL, " +
		"$COLUMN_FRESHNESS_ID TEXT, " +
		@@ -635,9 +624,7 @@ constructor(
		"$COLUMN_FLAGS INTEGER NOT NULL DEFAULT 0, " +
		"$COLUMN_LABEL TEXT, " +
		"PRIMARY KEY ($COLUMN_COMPONENT, $COLUMN_USER) " +
		");")
		)
		}
		");"
		}

		companion object {

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -111,16 +111,16 @@ class MonoIconThemeController(
		}

		override fun decode(
		data: ByteArray,
		bytes: ByteArray,
		info: BitmapInfo,
		factory: BaseIconFactory,
		sourceHint: SourceHint,
		): ThemedBitmap {
		val icon = info.icon
		if (data.size != icon.height * icon.width) return ThemedBitmap.NOT_SUPPORTED
		if (bytes.size != icon.height * icon.width) return ThemedBitmap.NOT_SUPPORTED

		var monoBitmap = Bitmap.createBitmap(icon.width, icon.height, ALPHA_8)
		monoBitmap.copyPixelsFromBuffer(ByteBuffer.wrap(data))
		monoBitmap.copyPixelsFromBuffer(ByteBuffer.wrap(bytes))

		val hwMonoBitmap = monoBitmap.copy(HARDWARE, false /isMutable/)
		if (hwMonoBitmap != null) {