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

Merge "SysUI: Don't try to put non-resizeable task in split-screen" into rvc-dev am: 28970f1138

Browse Source 
Change-Id: I6a609d510669c8eba7d433a389295656b46da053
This commit is contained in:
TreeHugger Robot
2020-04-21 10:53:51 +00:00
committed by Automerger Merge Worker
parent 97b5bdb565 28970f1138
commit 755ddabf36
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,12 +180,17 @@ public class WindowManagerProxy {
if (isHomeOrRecentTask(rootTask)) { if (isHomeOrRecentTask(rootTask)) {
tiles.mHomeAndRecentsSurfaces.add(rootTask.token.getLeash()); tiles.mHomeAndRecentsSurfaces.add(rootTask.token.getLeash());
} }
// Only move resizeable task to split secondary. WM will just ignore this anyways...
if (!rootTask.isResizable()) continue;
// Only move fullscreen tasks to split secondary.
if (rootTask.configuration.windowConfiguration.getWindowingMode() if (rootTask.configuration.windowConfiguration.getWindowingMode()
!= WINDOWING_MODE_FULLSCREEN) { != WINDOWING_MODE_FULLSCREEN) {
continue; continue;
} }
wct.reparent(rootTask.token, tiles.mSecondary.token, true /* onTop */); wct.reparent(rootTask.token, tiles.mSecondary.token, true /* onTop */);
} }
// Move the secondary split-forward.
wct.reorder(tiles.mSecondary.token, true /* onTop */);
boolean isHomeResizable = applyHomeTasksMinimized(layout, null /* parent */, wct); boolean isHomeResizable = applyHomeTasksMinimized(layout, null /* parent */, wct);
WindowOrganizer.applyTransaction(wct); WindowOrganizer.applyTransaction(wct);
return isHomeResizable; return isHomeResizable;