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

Commit 22572023 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Initialize stable bounds during onDragStart" into udc-qpr-dev

parents be10d855 11835666

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

+4 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { 
        mDragStartListener = dragStartListener;

        mTransactionSupplier = supplier;

        mDisallowedAreaForEndBoundsHeight = disallowedAreaForEndBoundsHeight;

        mDisplayController.getDisplayLayout(windowDecoration.mDisplay.getDisplayId())

                .getStableBounds(mStableBounds);

    }



    @Override
@@ -80,6 +78,10 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { 
            mTaskOrganizer.applyTransaction(wct);

        }

        mRepositionTaskBounds.set(mTaskBoundsAtDragStart);

        if (mStableBounds.isEmpty()) {

            mDisplayController.getDisplayLayout(mWindowDecoration.mDisplay.getDisplayId())

                    .getStableBounds(mStableBounds);

        }

    }



    @Override

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

+4 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, 
        mTransactionSupplier = supplier;

        mTransitions = transitions;

        mDisallowedAreaForEndBoundsHeight = disallowedAreaForEndBoundsHeight;

        mDisplayController.getDisplayLayout(windowDecoration.mDisplay.getDisplayId())

                .getStableBounds(mStableBounds);

    }



    @Override
@@ -100,6 +98,10 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, 
        }

        mDragStartListener.onDragStart(mDesktopWindowDecoration.mTaskInfo.taskId);

        mRepositionTaskBounds.set(mTaskBoundsAtDragStart);

        if (mStableBounds.isEmpty()) {

            mDisplayController.getDisplayLayout(mDesktopWindowDecoration.mDisplay.getDisplayId())

                    .getStableBounds(mStableBounds);

        }

    }



    @Override