Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb85a4e authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

SysUI: Don't try to put non-resizeable task in split-screen 

WM would just ignore the request anyways.
Also, move secondary split task forward when entering split so random
non-resizeable task doesn't end up on-top.

Test: Repro. steps in bug.
Fixes: 154362321
Change-Id: I552f4ebbb132eb1944e42e53563f75a109b25815
parent 28665792

packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java

+5 −0
Original line number Diff line number Diff line
@@ -180,12 +180,17 @@ public class WindowManagerProxy { 
            if (isHomeOrRecentTask(rootTask)) {

                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()

                    != WINDOWING_MODE_FULLSCREEN) {

                continue;

            }

            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);

        WindowOrganizer.applyTransaction(wct);

        return isHomeResizable;