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

Commit c6caf122 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: 30f6d647 

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



Change-Id: Ifeff54f0984d5d34703a017035299308a3ecc062
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b06cbb98 30f6d647

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

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

            }





            final int otherWindowingMode = other.getWindowingMode();

            final int otherWindowingMode = other.getWindowingMode();

            if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN) {

            if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN

                if (isTranslucent(other, starting)) {

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

                    // 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 (isTranslucent(other, starting)) {

                if (isTranslucent(other, starting)) {

                    // Can be visible behind a translucent TaskFragment.

                    // Can be visible behind a translucent TaskFragment.

                    gotTranslucentFullscreen = true;

                    gotTranslucentFullscreen = true;

                    continue;

                    continue;

                }

                }

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

                return TASK_FRAGMENT_VISIBILITY_INVISIBLE;

                return TASK_FRAGMENT_VISIBILITY_INVISIBLE;

            }

            }