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

Commit a1b66cbf authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "Floating task should not intersect with display insets" into main

parents 99beaf7c a3313de3

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

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.ROTATION_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
@@ -2453,7 +2452,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
            inOutConfig.windowConfiguration.setAppBounds(mTmpFullBounds);

            outAppBounds = inOutConfig.windowConfiguration.getAppBounds();



            if (!customContainerPolicy && windowingMode != WINDOWING_MODE_FREEFORM) {

            // Floating tasks shouldn't be restricted by containing app bounds.

            if (!customContainerPolicy && !isFloating(windowingMode)) {

                final Rect containingAppBounds;

                if (insideParentBounds) {

                    containingAppBounds = useOverrideInsetsForConfig