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

Commit c4d7ee11 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Avoid recursion for leaf task fragment in freeform mode" into main am:... 

Merge "Avoid recursion for leaf task fragment in freeform mode" into main am: 30f6d647 am: c6caf122 am: 4625943b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2674876



Change-Id: I7069eb7cb7781221c4e23dd14dc2c895db15874c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd6680b6 4625943b

services/core/java/com/android/server/wm/TaskFragment.java

+2 −10
Original line number Diff line number Diff line
@@ -1081,21 +1081,13 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
            }



            final int otherWindowingMode = other.getWindowingMode();

            if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN) {

                if (isTranslucent(other, starting)) {

                    // Can be visible behind a translucent fullscreen TaskFragment.

                    gotTranslucentFullscreen = true;

                    continue;

                }

                return TASK_FRAGMENT_VISIBILITY_INVISIBLE;

            } else if (otherWindowingMode == WINDOWING_MODE_MULTI_WINDOW

                    && other.matchParentBounds()) {

            if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN

                    || (otherWindowingMode != WINDOWING_MODE_PINNED && other.matchParentBounds())) {

                if (isTranslucent(other, starting)) {

                    // Can be visible behind a translucent TaskFragment.

                    gotTranslucentFullscreen = true;

                    continue;

                }

                // Multi-window TaskFragment that matches parent bounds would occlude other children

                return TASK_FRAGMENT_VISIBILITY_INVISIBLE;

            }