Merge "Use default thumbnail if getting app thumbnail fails" (8064ec61) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ public class RecentsPanelView extends RelativeLayout
		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 class RecentsPanelView extends RelativeLayout
		}

		public void setThumbnail(Bitmap thumbnail) {
		mThumbnail = compositeBitmap(mAppThumbnailBackground, thumbnail);
		mThumbnail = compositeBitmap(mDefaultThumbnailBackground, thumbnail);
		}

		public Bitmap getThumbnail() {
		@@ -339,8 +339,8 @@ public class RecentsPanelView extends RelativeLayout
		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 @@ public class RecentsPanelView extends RelativeLayout
		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 @@ public class RecentsPanelView extends RelativeLayout
		}
		mActivityDescriptions = getRecentTasks();
		for (ActivityDescription ad : mActivityDescriptions) {
		ad.setThumbnail(mAppThumbnailBackground);
		ad.setThumbnail(mDefaultThumbnailBackground);
		}
		mListAdapter.notifyDataSetInvalidated();
		if (mActivityDescriptions.size() > 0) {