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

Commit da9cf0f6 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge changes I705b7a65,I98a2e71a into ub-launcher3-qt-dev 

* changes:
  Allow touches on launcher while animating to home
  End window animation to home when handler invalidated
parents ae6e3187 1a468145

quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewInputConsumer.java

+12 −4
Original line number Diff line number Diff line
@@ -22,13 +22,15 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY 
import android.view.KeyEvent;

import android.view.MotionEvent;



import androidx.annotation.Nullable;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.Utilities;

import com.android.launcher3.views.BaseDragLayer;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.InputMonitorCompat;



import androidx.annotation.Nullable;

import java.util.function.Predicate;



/**

 * Input consumer for handling touch on the recents/Launcher activity.
@@ -42,6 +44,7 @@ public class OverviewInputConsumer<T extends BaseDraggingActivity> 


    private final int[] mLocationOnScreen = new int[2];

    private final boolean mProxyTouch;

    private final Predicate<MotionEvent> mEventReceiver;



    private final boolean mStartingInActivityBounds;

    private boolean mTargetHandledTouch;
@@ -53,11 +56,16 @@ public class OverviewInputConsumer<T extends BaseDraggingActivity> 
        mStartingInActivityBounds = startingInActivityBounds;



        mTarget = activity.getDragLayer();

        if (!startingInActivityBounds) {

        if (startingInActivityBounds) {

            mEventReceiver = mTarget::dispatchTouchEvent;

            mProxyTouch = true;

        } else {

            // Only proxy touches to controllers if we are starting touch from nav bar.

            mEventReceiver = mTarget::proxyTouchEvent;

            mTarget.getLocationOnScreen(mLocationOnScreen);

        }

            mProxyTouch = mTarget.prepareProxyEventStarting();

        }

    }



    @Override

    public int getType() {
@@ -80,7 +88,7 @@ public class OverviewInputConsumer<T extends BaseDraggingActivity> 
            ev.setEdgeFlags(flags | Utilities.EDGE_NAV_BAR);

        }

        ev.offsetLocation(-mLocationOnScreen[0], -mLocationOnScreen[1]);

        boolean handled = mTarget.proxyTouchEvent(ev);

        boolean handled = mEventReceiver.test(ev);

        ev.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]);

        ev.setEdgeFlags(flags);

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

+29 −4
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 


    protected Runnable mGestureEndCallback;

    protected GestureEndTarget mGestureEndTarget;

    // Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise

    private RunningWindowAnim mRunningWindowAnim;

    private boolean mIsShelfPeeking;

    private DeviceProfile mDp;

    private int mTransitionDragLength;
@@ -805,7 +807,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 


    @UiThread

    private InputConsumer createNewInputProxyHandler() {

        mCurrentShift.finishAnimation();

        endRunningWindowAnim();

        if (mLauncherTransitionController != null) {

            mLauncherTransitionController.getAnimationPlayer().end();

        }
@@ -817,6 +819,12 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
        return OverviewInputConsumer.newInstance(mActivityControlHelper, null, true);

    }



    private void endRunningWindowAnim() {

        if (mRunningWindowAnim != null) {

            mRunningWindowAnim.end();

        }

    }



    @UiThread

    private void handleNormalGestureEnd(float endVelocity, boolean isFling, PointF velocity,

            boolean isCancel) {
@@ -898,12 +906,15 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
            }

        }



        if (endTarget.isLauncher) {

            mRecentsAnimationWrapper.enableInputProxy();

        }



        if (endTarget == HOME) {

            setShelfState(ShelfAnimState.CANCEL, LINEAR, 0);

            duration = Math.max(MIN_OVERSHOOT_DURATION, duration);

        } else if (endTarget == RECENTS) {

            mLiveTileOverlay.startIconAnimation();

            mRecentsAnimationWrapper.enableInputProxy();

            if (mRecentsView != null) {

                duration = Math.max(duration, mRecentsView.getScroller().getDuration());

            }
@@ -984,6 +995,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
                }

            });

            windowAnim.start(velocityPxPerMs);

            mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);

            mLauncherTransitionController = null;

        } else {

            ValueAnimator windowAnim = mCurrentShift.animateToValue(start, end);
@@ -1002,6 +1014,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
                }

            });

            windowAnim.start();

            mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);

        }

        // Always play the entire launcher animation when going home, since it is separate from

        // the animation that has been controlled thus far.
@@ -1113,7 +1126,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
                        false /* animate */, true /* freezeTaskList */);

            });

        }

        TOUCH_INTERACTION_LOG.addLog("finishRecentsAnimation", false);

        TOUCH_INTERACTION_LOG.addLog("finishRecentsAnimation", true);

        doLogGesture(NEW_TASK);

        reset();

    }
@@ -1135,7 +1148,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
    }



    private void invalidateHandler() {

        mCurrentShift.finishAnimation();

        endRunningWindowAnim();



        if (mGestureEndCallback != null) {

            mGestureEndCallback.run();
@@ -1283,4 +1296,16 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
        return app.isNotInRecents

                || app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;

    }



    private interface RunningWindowAnim {

        void end();



        static RunningWindowAnim wrap(Animator animator) {

            return animator::end;

        }



        static RunningWindowAnim wrap(RectFSpringAnim rectFSpringAnim) {

            return rectFSpringAnim::end;

        }

    }

}

quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java

+25 −11
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ import android.graphics.PointF; 
import android.graphics.RectF;

import android.util.FloatProperty;



import androidx.dynamicanimation.animation.DynamicAnimation.OnAnimationEndListener;

import androidx.dynamicanimation.animation.FloatPropertyCompat;



import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.FlingSpringAnim;
@@ -30,9 +33,6 @@ import com.android.launcher3.anim.FlingSpringAnim; 
import java.util.ArrayList;

import java.util.List;



import androidx.dynamicanimation.animation.DynamicAnimation.OnAnimationEndListener;

import androidx.dynamicanimation.animation.FloatPropertyCompat;



/**

 * Applies spring forces to animate from a starting rect to a target rect,

 * while providing update callbacks to the caller.
@@ -98,6 +98,10 @@ public class RectFSpringAnim { 
    private float mCurrentCenterX;

    private float mCurrentCenterY;

    private float mCurrentScaleProgress;

    private FlingSpringAnim mRectXAnim;

    private FlingSpringAnim mRectYAnim;

    private ValueAnimator mRectScaleAnim;

    private boolean mAnimsStarted;

    private boolean mRectXAnimEnded;

    private boolean mRectYAnimEnded;

    private boolean mRectScaleAnimEnded;
@@ -127,15 +131,15 @@ public class RectFSpringAnim { 
            mRectYAnimEnded = true;

            maybeOnEnd();

        });

        FlingSpringAnim rectXAnim = new FlingSpringAnim(this, RECT_CENTER_X, mCurrentCenterX,

        mRectXAnim = new FlingSpringAnim(this, RECT_CENTER_X, mCurrentCenterX,

                mTargetRect.centerX(), velocityPxPerMs.x * 1000, onXEndListener);

        FlingSpringAnim rectYAnim = new FlingSpringAnim(this, RECT_CENTER_Y, mCurrentCenterY,

        mRectYAnim = new FlingSpringAnim(this, RECT_CENTER_Y, mCurrentCenterY,

                mTargetRect.centerY(), velocityPxPerMs.y * 1000, onYEndListener);



        ValueAnimator rectScaleAnim = ObjectAnimator.ofPropertyValuesHolder(this,

        mRectScaleAnim = ObjectAnimator.ofPropertyValuesHolder(this,

                PropertyValuesHolder.ofFloat(RECT_SCALE_PROGRESS, 1))

                .setDuration(RECT_SCALE_DURATION);

        rectScaleAnim.addListener(new AnimationSuccessListener() {

        mRectScaleAnim.addListener(new AnimationSuccessListener() {

            @Override

            public void onAnimationSuccess(Animator animator) {

                mRectScaleAnimEnded = true;
@@ -143,14 +147,23 @@ public class RectFSpringAnim { 
            }

        });



        rectXAnim.start();

        rectYAnim.start();

        rectScaleAnim.start();

        mRectXAnim.start();

        mRectYAnim.start();

        mRectScaleAnim.start();

        mAnimsStarted = true;

        for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {

            animatorListener.onAnimationStart(null);

        }

    }



    public void end() {

        if (mAnimsStarted) {

            mRectXAnim.end();

            mRectYAnim.end();

            mRectScaleAnim.end();

        }

    }



    private void onUpdate() {

        if (!mOnUpdateListeners.isEmpty()) {

            float currentWidth = Utilities.mapRange(mCurrentScaleProgress, mStartRect.width(),
@@ -166,7 +179,8 @@ public class RectFSpringAnim { 
    }



    private void maybeOnEnd() {

        if (mRectXAnimEnded && mRectYAnimEnded && mRectScaleAnimEnded) {

        if (mAnimsStarted && mRectXAnimEnded && mRectYAnimEnded && mRectScaleAnimEnded) {

            mAnimsStarted = false;

            for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {

                animatorListener.onAnimationEnd(null);

            }

src/com/android/launcher3/anim/FlingSpringAnim.java

+11 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ public class FlingSpringAnim { 
    private static final float SPRING_DAMPING = SpringForce.DAMPING_RATIO_LOW_BOUNCY;



    private final FlingAnimation mFlingAnim;

    private SpringAnimation mSpringAnim;



    public <K> FlingSpringAnim(K object, FloatPropertyCompat<K> property, float startPosition,

            float targetPosition, float startVelocity, OnAnimationEndListener onEndListener) {
@@ -44,17 +45,24 @@ public class FlingSpringAnim { 
                .setMinValue(Math.min(startPosition, targetPosition))

                .setMaxValue(Math.max(startPosition, targetPosition));

        mFlingAnim.addEndListener(((animation, canceled, value, velocity) -> {

            SpringAnimation springAnim = new SpringAnimation(object, property)

            mSpringAnim = new SpringAnimation(object, property)

                    .setStartVelocity(velocity)

                    .setSpring(new SpringForce(targetPosition)

                            .setStiffness(SPRING_STIFFNESS)

                            .setDampingRatio(SPRING_DAMPING));

            springAnim.addEndListener(onEndListener);

            springAnim.start();

            mSpringAnim.addEndListener(onEndListener);

            mSpringAnim.start();

        }));

    }



    public void start() {

        mFlingAnim.start();

    }



    public void end() {

        mFlingAnim.cancel();

        if (mSpringAnim.canSkipToEnd()) {

            mSpringAnim.skipToEnd();

        }

    }

}