commit 11e41baac63a42d7ddb7ba2cab40ee55443d262f
author Winson Chung <winsonc@google.com> Mon Apr 21 12:39:20 2014 -0700
committer Winson Chung <winsonc@google.com> Mon Apr 21 12:40:52 2014 -0700
tree 4c39e975c5aa308b21fca1eeed7f25d98c7abdd7
parent d67d073b9fd110e6b9dfa6af11e8655dcc69f6ef

Overriding application icon with activity icon where available.

Change-Id: I03ee8f806b3853183db7f96e71f1684c72b79c57

packages/SystemUI/src/com/android/systemui/recents/model/Task.java

diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/Task.java b/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
index ff062f6c..1566a49 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
@@ -18,6 +18,7 @@
 
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
 
@@ -69,8 +70,8 @@
 
     public TaskKey key;
     public Drawable applicationIcon;
+    public Drawable activityIcon;
     public String activityLabel;
-    public Bitmap activityIcon;
     public Bitmap thumbnail;
     public boolean isActive;
     public int userId;
@@ -82,7 +83,7 @@
     }
 
     public Task(int id, boolean isActive, Intent intent, String activityTitle,
-                Bitmap activityIcon, int userId) {
+                BitmapDrawable activityIcon, int userId) {
         this.key = new TaskKey(id, intent, userId);
         this.activityLabel = activityTitle;
         this.activityIcon = activityIcon;