From 2ae7736d09125ef92b53c6f7231f4092cdea2795 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 22 Mar 2016 14:32:44 -0700 Subject: [PATCH] Embedding the icon pixel size in the cache DB version. This causes the cache to get reset when the icon size changes, for eg, in case of display scale changes Bug: 27701193 Change-Id: Ib11144757a93cb50fb233d855902c0b2c15afbed --- src/com/android/launcher3/IconCache.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 84bfd89c31..27e01c37a4 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -117,7 +117,7 @@ public class IconCache { mUserManager = UserManagerCompat.getInstance(mContext); mLauncherApps = LauncherAppsCompat.getInstance(mContext); mIconDpi = inv.fillResIconDpi; - mIconDb = new IconDB(context); + mIconDb = new IconDB(context, inv.iconBitmapSize); mLowResCanvas = new Canvas(); mLowResPaint = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG); @@ -816,8 +816,10 @@ public class IconCache { private final static String COLUMN_LABEL = "label"; private final static String COLUMN_SYSTEM_STATE = "system_state"; - public IconDB(Context context) { - super(context, LauncherFiles.APP_ICONS_DB, RELEASE_VERSION, TABLE_NAME); + public IconDB(Context context, int iconPixelSize) { + super(context, LauncherFiles.APP_ICONS_DB, + (RELEASE_VERSION << 16) + iconPixelSize, + TABLE_NAME); } @Override