Merge "Use default thumbnail if getting app thumbnail fails"
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
index d7bb3c4..fc33931 100644
--- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
@@ -84,7 +84,7 @@
private View mRecentsScrim;
private View mRecentsGlowView;
private ViewGroup mRecentsContainer;
- private Bitmap mAppThumbnailBackground;
+ private Bitmap mDefaultThumbnailBackground;
private boolean mShowing;
private Choreographer mChoreo;
@@ -125,7 +125,7 @@
}
public void setThumbnail(Bitmap thumbnail) {
- mThumbnail = compositeBitmap(mAppThumbnailBackground, thumbnail);
+ mThumbnail = compositeBitmap(mDefaultThumbnailBackground, thumbnail);
}
public Bitmap getThumbnail() {
@@ -339,8 +339,8 @@
int width = (int) res.getDimension(R.dimen.status_bar_recents_thumbnail_width);
int height = (int) res.getDimension(R.dimen.status_bar_recents_thumbnail_height);
int color = res.getColor(R.drawable.status_bar_recents_app_thumbnail_background);
- mAppThumbnailBackground = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
- Canvas c = new Canvas(mAppThumbnailBackground);
+ mDefaultThumbnailBackground = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ Canvas c = new Canvas(mDefaultThumbnailBackground);
c.drawColor(color);
}
@@ -517,7 +517,7 @@
synchronized (ad) {
ad.mLabel = label;
ad.mIcon = icon;
- ad.setThumbnail(thumbs != null ? thumbs.mainThumbnail : null);
+ ad.setThumbnail(thumbs != null ? thumbs.mainThumbnail : mDefaultThumbnailBackground);
}
}
@@ -577,7 +577,7 @@
}
mActivityDescriptions = getRecentTasks();
for (ActivityDescription ad : mActivityDescriptions) {
- ad.setThumbnail(mAppThumbnailBackground);
+ ad.setThumbnail(mDefaultThumbnailBackground);
}
mListAdapter.notifyDataSetInvalidated();
if (mActivityDescriptions.size() > 0) {