am 12c9e3a0: Merge "Removing the old tasks on launching recents task if they trigger a new task."

* commit '12c9e3a00bf912167d1c40a356d19301c93bfdd0':
  Removing the old tasks on launching recents task if they trigger a new task.
This commit is contained in:
Winson Chung
2014-05-08 22:38:15 +00:00
committed by Android Git Automerger
6 changed files with 54 additions and 19 deletions

View File

@@ -4807,6 +4807,7 @@ public class Activity extends ContextThemeWrapper
public void setRecentsActivityValues(ActivityManager.RecentsActivityValues values) {
ActivityManager.RecentsActivityValues activityValues =
new ActivityManager.RecentsActivityValues(values);
// Scale the icon down to something reasonable
if (values.icon != null) {
final int size = ActivityManager.getLauncherLargeIconSizeInner(this);
activityValues.icon = Bitmap.createScaledBitmap(values.icon, size, size, true);