diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-09-12 12:42:26 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-09-13 11:56:55 -0700 |
| commit | ad7ff440092e5bf3a013299755ef0137edd407ae (patch) | |
| tree | ca55c996453788990a190fd1f278eae2195acbea /src/com/android/launcher3/AutoInstallsLayout.java | |
| parent | b22a49a6770f5b1a04c708d0b2bf7531a26f819a (diff) | |
| download | android_packages_apps_Trebuchet-ad7ff440092e5bf3a013299755ef0137edd407ae.tar.gz android_packages_apps_Trebuchet-ad7ff440092e5bf3a013299755ef0137edd407ae.tar.bz2 android_packages_apps_Trebuchet-ad7ff440092e5bf3a013299755ef0137edd407ae.zip | |
Unifying various icon loading methods
Change-Id: I5a8969b6aad6513d769b5bb38bf95a701fe346d8
Diffstat (limited to 'src/com/android/launcher3/AutoInstallsLayout.java')
| -rw-r--r-- | src/com/android/launcher3/AutoInstallsLayout.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java index d82579bf7..162aa0889 100644 --- a/src/com/android/launcher3/AutoInstallsLayout.java +++ b/src/com/android/launcher3/AutoInstallsLayout.java @@ -28,7 +28,9 @@ import android.content.res.XmlResourceParser; import android.database.sqlite.SQLiteDatabase; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.os.Process; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; @@ -433,8 +435,10 @@ public class AutoInstallsLayout { return -1; } - mValues.put(LauncherSettings.Favorites.ICON, - Utilities.flattenBitmap(LauncherIcons.createIconBitmap(icon, mContext))); + // Auto installs should always support the current platform version. + mValues.put(LauncherSettings.Favorites.ICON, Utilities.flattenBitmap( + LauncherIcons.createBadgedIconBitmap( + icon, Process.myUserHandle(), mContext, Build.VERSION.SDK_INT))); mValues.put(Favorites.ICON_PACKAGE, mIconRes.getResourcePackageName(iconId)); mValues.put(Favorites.ICON_RESOURCE, mIconRes.getResourceName(iconId)); |