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

Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: 6f5e679917

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: Ifd5f9cfce04ab35856e85d752706960b0cd00ed3
This commit is contained in:
Wei Sheng Shih
2020-06-12 06:31:54 +00:00
committed by Automerger Merge Worker
parent b8c7cb2e19 6f5e679917
commit a5c1755a72
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
View File

@@ -229,7 +229,11 @@ public class WindowManagerProxy {
// as a result, the above will not capture any tasks; yet, we need to clean-up the // as a result, the above will not capture any tasks; yet, we need to clean-up the
// home task bounds. // home task bounds.
List<ActivityManager.RunningTaskInfo> freeHomeAndRecents = List<ActivityManager.RunningTaskInfo> freeHomeAndRecents =
TaskOrganizer.getRootTasks(Display.DEFAULT_DISPLAY, HOME_AND_RECENTS); TaskOrganizer.getRootTasks(DEFAULT_DISPLAY, HOME_AND_RECENTS);
// Filter out the root split tasks
freeHomeAndRecents.removeIf(p -> p.token.equals(tiles.mSecondary.token)
|| p.token.equals(tiles.mPrimary.token));
if (primaryChildren.isEmpty() && secondaryChildren.isEmpty() if (primaryChildren.isEmpty() && secondaryChildren.isEmpty()
&& freeHomeAndRecents.isEmpty()) { && freeHomeAndRecents.isEmpty()) {
return; return;