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

Commit 30dfe8ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing state not set properly when configuration changes and remote... 

Merge "Fixing state not set properly when configuration changes and remote animation callback comes after threshold is crossed" into ub-launcher3-master
parents 6e11a2d9 ba7dba39

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+7 −3
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { 
    public void updateDisplacement(float displacement) {

        // We are moving in the negative x/y direction

        displacement = -displacement;

        if (displacement > mTransitionDragLength) {

        if (displacement > mTransitionDragLength && mTransitionDragLength > 0) {

            mCurrentShift.updateValue(1);



            if (!mBgLongSwipeMode) {
@@ -815,8 +815,12 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { 
        long startMillis = SystemClock.uptimeMillis();

        executeOnUiThread(() -> {

            // Animate the launcher components at the same time as the window, always on UI thread.

            if (mLauncherTransitionController != null && !mWasLauncherAlreadyVisible

                    && start != end && duration > 0) {

            if (mLauncherTransitionController == null) {

                return;

            }

            if (start == end || duration <= 0) {

                mLauncherTransitionController.getAnimationPlayer().end();

            } else {

                // Adjust start progress and duration in case we are on a different thread.

                long elapsedMillis = SystemClock.uptimeMillis() - startMillis;

                elapsedMillis = Utilities.boundToRange(elapsedMillis, 0, duration);