Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-10-06 20:28:07 +00:00
committed by Android (Google) Code Review
parent febf33fe4b 4d03fe6420
commit f46bb1d99b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/am/ActivityStack.java
View File

@@ -673,6 +673,14 @@ final class ActivityStack {
return null; return null;
} }
TaskRecord tr = who.task;
if (tr.intent != null && (tr.intent.getFlags()
&Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0) {
// If this task is being excluded from recents, we don't want to take
// the expense of capturing a thumbnail, since we will never show it.
return null;
}
Resources res = mService.mContext.getResources(); Resources res = mService.mContext.getResources();
int w = mThumbnailWidth; int w = mThumbnailWidth;
int h = mThumbnailHeight; int h = mThumbnailHeight;
@@ -685,6 +693,7 @@ final class ActivityStack {
if (w > 0) { if (w > 0) {
if (who != mLastScreenshotActivity || mLastScreenshotBitmap == null if (who != mLastScreenshotActivity || mLastScreenshotBitmap == null
|| mLastScreenshotActivity.state == ActivityState.RESUMED
|| mLastScreenshotBitmap.getWidth() != w || mLastScreenshotBitmap.getWidth() != w
|| mLastScreenshotBitmap.getHeight() != h) { || mLastScreenshotBitmap.getHeight() != h) {
mLastScreenshotActivity = who; mLastScreenshotActivity = who;