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

Commit 8e652e97 authored by mattsziklay's avatar mattsziklay
Browse files

Return copy of reposition bounds on drag start. 

Drag start would return the instance of reposition bounds, rather than a
copy of it. This would then be altered by the calling method, changing
the coordinates to local space. This would interfere with the equality
check in onDragPositioningEnd, causing the veil to not be dismissed
correctly. This CL fixes that by copying the reposition bounds, similar
to the other methods.

Bug: 313500992
Test: Manual
Change-Id: I1757e936d1aa8f624e8db3e0fa4ceb87ef755b77
parent 1a058643

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { 
            mDisplayController.getDisplayLayout(mWindowDecoration.mDisplay.getDisplayId())

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

                    .getStableBounds(mStableBounds);

                    .getStableBounds(mStableBounds);

        }

        }

        return mRepositionTaskBounds;

        return new Rect(mRepositionTaskBounds);

    }

    }





    @Override

    @Override

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, 
            mDisplayController.getDisplayLayout(mDesktopWindowDecoration.mDisplay.getDisplayId())

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

                    .getStableBounds(mStableBounds);

                    .getStableBounds(mStableBounds);

        }

        }

        return mRepositionTaskBounds;

        return new Rect(mRepositionTaskBounds);

    }

    }





    @Override

    @Override