diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-21 00:41:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 00:41:44 +0000 |
commit | 1b21faef02f173d7a8b80fe01d34f57b5e28a4b4 (patch) | |
tree | d4be4e979b70d2e06768c0b295a81e0d7ae5194d | |
parent | 86179020cc1a273d7e753d278fd844b90df456b0 (diff) | |
parent | df6ccf81960ab73d46570d56443e94c4df48e0c8 (diff) | |
download | android_packages_apps_Trebuchet-1b21faef02f173d7a8b80fe01d34f57b5e28a4b4.tar.gz android_packages_apps_Trebuchet-1b21faef02f173d7a8b80fe01d34f57b5e28a4b4.tar.bz2 android_packages_apps_Trebuchet-1b21faef02f173d7a8b80fe01d34f57b5e28a4b4.zip |
Merge "Resizing the bitmap before caching it in the DB" into ub-launcher3-burnaby
-rw-r--r-- | src/com/android/launcher3/IconCache.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 916418f18..b4ca515d8 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -649,7 +649,7 @@ public class IconCache { * @param dpi the native density of the icon */ public void preloadIcon(ComponentName componentName, Bitmap icon, int dpi, String label, - long userSerial) { + long userSerial, InvariantDeviceProfile idp) { // TODO rescale to the correct native DPI try { PackageManager packageManager = mContext.getPackageManager(); @@ -660,7 +660,9 @@ public class IconCache { // pass } - ContentValues values = newContentValues(icon, label, Color.TRANSPARENT); + ContentValues values = newContentValues( + Bitmap.createScaledBitmap(icon, idp.iconBitmapSize, idp.iconBitmapSize, true), + label, Color.TRANSPARENT); values.put(IconDB.COLUMN_COMPONENT, componentName.flattenToString()); values.put(IconDB.COLUMN_USER, userSerial); mIconDb.getWritableDatabase().insertWithOnConflict(IconDB.TABLE_NAME, null, values, diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index 8c6fedbdc..744f73bda 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -601,10 +601,11 @@ public class LauncherBackupHelper implements BackupHelper { Bitmap icon = BitmapFactory.decodeByteArray(res.data, 0, res.data.length); if (icon == null) { Log.w(TAG, "failed to unpack icon for " + key.name); + } else { + if (VERBOSE) Log.v(TAG, "saving restored icon as: " + key.name); + mIconCache.preloadIcon(ComponentName.unflattenFromString(key.name), icon, res.dpi, + "" /* label */, mUserSerial, mIdp); } - if (VERBOSE) Log.v(TAG, "saving restored icon as: " + key.name); - mIconCache.preloadIcon(ComponentName.unflattenFromString(key.name), icon, res.dpi, - "" /* label */, mUserSerial); } /** @@ -685,7 +686,7 @@ public class LauncherBackupHelper implements BackupHelper { Log.w(TAG, "failed to unpack widget icon for " + key.name); } else { mIconCache.preloadIcon(ComponentName.unflattenFromString(widget.provider), - icon, widget.icon.dpi, widget.label, mUserSerial); + icon, widget.icon.dpi, widget.label, mUserSerial, mIdp); } } |