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

Merge "Fixes TaskStackLayoutAlgorithm log errors when window rect is empty" into oc-mr1-dev

Browse Source 
am: 7673a55f3e

Change-Id: Ic89dad11832a55111b8be425ab3a1b53c8ebafa3
This commit is contained in:
Matthew Ng
2017-09-01 01:46:24 +00:00
committed by android-build-merger
parent 04e7d1fa20 7673a55f3e
commit 9e7fdeb347
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
View File

@@ -132,6 +132,11 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
// Preloads the next task
RecentsConfiguration config = Recents.getConfiguration();
if (config.svelteLevel == RecentsConfiguration.SVELTE_NONE) {
Rect windowRect = getWindowRect(null /* windowRectOverride */);
if (windowRect.isEmpty()) {
return;
}
// Load the next task only if we aren't svelte
SystemServicesProxy ssp = Recents.getSystemServices();
ActivityManager.RunningTaskInfo runningTaskInfo = ssp.getRunningTask();
@@ -146,8 +151,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
// This callback is made when a new activity is launched and the old one is
// paused so ignore the current activity and try and preload the thumbnail for
// the previous one.
updateDummyStackViewLayout(mBackgroundLayoutAlgorithm, stack,
getWindowRect(null /* windowRectOverride */));
updateDummyStackViewLayout(mBackgroundLayoutAlgorithm, stack, windowRect);
// Launched from app is always the worst case (in terms of how many
// thumbnails/tasks visible)