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

Commit 4dcdd70c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix split animation for grid RTL" into sc-v2-dev am: d1c9cd27 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16418133

Change-Id: I98fab9b33140369690a3c893643be02515f0d11f
parents bcf2060c d1c9cd27

quickstep/src/com/android/quickstep/views/FloatingTaskView.java

+8 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class FloatingTaskView extends FrameLayout { 
    public void update(RectF position, float progress, float windowRadius) {

        MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams();



        float dX = position.left - lp.getMarginStart();

        float dX = position.left - mStartingPosition.left;

        float dY = position.top - lp.topMargin;



        setTranslationX(dX);
@@ -160,10 +160,15 @@ public class FloatingTaskView extends FrameLayout { 
        lp.ignoreInsets = true;

        // Position the floating view exactly on top of the original

        lp.topMargin = Math.round(pos.top);

        if (mIsRtl) {

            lp.setMarginStart(mLauncher.getDeviceProfile().widthPx - Math.round(pos.right));

        } else {

            lp.setMarginStart(Math.round(pos.left));

        }



        // Set the properties here already to make sure they are available when running the first

        // animation frame.

        int left = lp.leftMargin;

        int left = (int) pos.left;

        layout(left, lp.topMargin, left + lp.width, lp.topMargin + lp.height);

    }