From 259c4f86fffe4590ebdbfeb0ec2f27f4126744e4 Mon Sep 17 00:00:00 2001 From: Manuel Lorenzo Date: Fri, 5 Feb 2021 13:57:38 +0100 Subject: [PATCH] bring back TaskDescriptionCompat class --- .../systemui/shared/system/TaskDescriptionCompat.java | 7 +++---- quickstep/src/com/android/quickstep/TaskIconCache.java | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SystemUISharedLib/src/main/java/com/android/systemui/shared/system/TaskDescriptionCompat.java b/SystemUISharedLib/src/main/java/com/android/systemui/shared/system/TaskDescriptionCompat.java index eaf8d9b573..9bc2e8203f 100644 --- a/SystemUISharedLib/src/main/java/com/android/systemui/shared/system/TaskDescriptionCompat.java +++ b/SystemUISharedLib/src/main/java/com/android/systemui/shared/system/TaskDescriptionCompat.java @@ -17,6 +17,7 @@ package com.android.systemui.shared.system; import android.app.ActivityManager; +import android.graphics.Bitmap; public class TaskDescriptionCompat { @@ -32,9 +33,7 @@ public class TaskDescriptionCompat { : 0; } - public int getBackgroundColor() { - return mTaskDescription != null - ? mTaskDescription.getBackgroundColor() - : 0; + public static Bitmap getIcon(ActivityManager.TaskDescription desc) { + return desc.getIcon(); } } diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java index 6c05b4ac5f..9067c3e8f7 100644 --- a/quickstep/src/com/android/quickstep/TaskIconCache.java +++ b/quickstep/src/com/android/quickstep/TaskIconCache.java @@ -47,6 +47,7 @@ import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.Task.TaskKey; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.PackageManagerWrapper; +import com.android.systemui.shared.system.TaskDescriptionCompat; import java.util.function.Consumer; /** @@ -137,7 +138,7 @@ public class TaskIconCache { // Load icon // TODO: Load icon resource (b/143363444) - Bitmap icon = TaskDescriptionCompat.getIcon(desc, key.userId); + Bitmap icon = TaskDescriptionCompat.getIcon(desc); if (icon != null) { entry.icon = new FastBitmapDrawable(getBitmapInfo( new BitmapDrawable(mContext.getResources(), icon),