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

Commit d129b893 authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Do not set a disallowedAreaForEndBounds in proto1 window decors" into... 

Merge "Do not set a disallowedAreaForEndBounds in proto1 window decors" into udc-qpr-dev am: 240e54f9

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



Change-Id: If22b2a214cbce01793e2fa267263e7cd3496657f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28dba1e9 240e54f9

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+7 −2
Original line number Diff line number Diff line
@@ -820,8 +820,13 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            @NonNull DesktopModeWindowDecoration windowDecoration,

            @NonNull RunningTaskInfo taskInfo) {

        final int screenWidth = mDisplayController.getDisplayLayout(taskInfo.displayId).width();

        final Rect disallowedAreaForEndBounds = new Rect(0, 0, screenWidth,

        final Rect disallowedAreaForEndBounds;

        if (DesktopModeStatus.isProto2Enabled()) {

            disallowedAreaForEndBounds = new Rect(0, 0, screenWidth,

                    getStatusBarHeight(taskInfo.displayId));

        } else {

            disallowedAreaForEndBounds = null;

        }

        if (!DesktopModeStatus.isVeiledResizeEnabled()) {

            return new FluidResizeTaskPositioner(mTaskOrganizer, windowDecoration,

                    mDisplayController, disallowedAreaForEndBounds, mDragStartListener,

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, 
    private final Rect mRepositionTaskBounds = new Rect();

    // If a task move (not resize) finishes in this region, the positioner will not attempt to

    // finalize the bounds there using WCT#setBounds

    private final Rect mDisallowedAreaForEndBounds = new Rect();

    private final Rect mDisallowedAreaForEndBounds;

    private final Supplier<SurfaceControl.Transaction> mTransactionSupplier;

    private int mCtrlType;
@@ -77,7 +77,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, 
        mDesktopWindowDecoration = windowDecoration;

        mDisplayController = displayController;

        mDragStartListener = dragStartListener;

        mDisallowedAreaForEndBounds.set(disallowedAreaForEndBounds);

        mDisallowedAreaForEndBounds = new Rect(disallowedAreaForEndBounds);

        mTransactionSupplier = supplier;

        mTransitions = transitions;

    }