Merge "Fixing shortcuts not getting theme icons" into tm-qpr-dev am: 1330244f0a am: d813bddf99

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20546011

Change-Id: I72835e139741384fe31bad16920c46dcabe9ee99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot authored and Automerger Merge Worker committed 2022-11-29 01:44:06 +00:00
commit 8e6fcd867f
4 files changed
+54 -11

No files matched your search

@@ -249,12 +249,13 @@ public class TaskIconCache implements DisplayInfoChangeListener {
private BitmapInfo getBitmapInfo(Drawable drawable, int userId,
int primaryColor, boolean isInstantApp) {
try (BaseIconFactory bif = getIconFactory()) {
bif.disableColorExtraction();
bif.setWrapperBackgroundColor(primaryColor);
// User version code O, so that the icon is always wrapped in an adaptive icon container
return bif.createBadgedIconBitmap(drawable,
new IconOptions().setUser(UserHandle.of(userId)).setInstantApp(isInstantApp));
new IconOptions().setUser(UserHandle.of(userId))
.setInstantApp(isInstantApp)
.setExtractedColor(0));
}
}