diff options
| author | Winson Chung <winsonc@google.com> | 2014-05-08 22:38:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 22:38:15 +0000 |
| commit | 9194acc50f1b23e29cdfe5373e91fdd0657445cb (patch) | |
| tree | e62971974f49a4bb886f18ec57b624c9806de6db /core | |
| parent | 8f75156f2fd497db449a1ee3fec4a4fa46cc7ad2 (diff) | |
| parent | 6e058419503910e0d5f67f9b51b84ad636ffa01f (diff) | |
| download | frameworks_base-9194acc50f1b23e29cdfe5373e91fdd0657445cb.zip frameworks_base-9194acc50f1b23e29cdfe5373e91fdd0657445cb.tar.gz frameworks_base-9194acc50f1b23e29cdfe5373e91fdd0657445cb.tar.bz2 | |
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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Activity.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 36f9f4b..ef6fcb7 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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); |