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

Commit bfe900b7 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Support split-screen modes on freeform displays" into rvc-dev am: cc9410f3 

Change-Id: I65d2b5e3f41c0488e81a9348319545c2b11e614e
parents 621d708b cc9410f3

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

+1 −5
Original line number Diff line number Diff line
@@ -1275,14 +1275,10 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { 
            return true;

        }



        final int displayWindowingMode = getWindowingMode();

        if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY

                || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY) {

            return supportsSplitScreen

                    && WindowConfiguration.supportSplitScreenWindowingMode(activityType)

                    // Freeform windows and split-screen windows don't mix well, so prevent

                    // split windowing modes on freeform displays.

                    && displayWindowingMode != WINDOWING_MODE_FREEFORM;

                    && WindowConfiguration.supportSplitScreenWindowingMode(activityType);

        }



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