mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-01 16:26:47 +00:00
Merge "Avoiding updating task via scroll if RectF spring animation is running" into tm-dev am: 689b000316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18561212 Change-Id: I93b35cc939115511c4a8e17736ddd4029d5cd350 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1996,9 +1996,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
* Applies the transform on the recents animation
|
||||
*/
|
||||
protected void applyScrollAndTransform() {
|
||||
// No need to apply any transform if there is ongoing swipe-pip-to-home animator since
|
||||
// that animator handles the leash solely.
|
||||
boolean notSwipingPipToHome = mRecentsAnimationTargets != null && !mIsSwipingPipToHome;
|
||||
// No need to apply any transform if there is ongoing swipe-to-home animator
|
||||
// swipe-to-pip handles the leash solely
|
||||
// swipe-to-icon animation is handled by RectFSpringAnim anim
|
||||
boolean notSwipingToHome = mRecentsAnimationTargets != null
|
||||
&& mGestureState.getEndTarget() != HOME;
|
||||
boolean setRecentsScroll = mRecentsViewScrollLinked && mRecentsView != null;
|
||||
for (RemoteTargetHandle remoteHandle : mRemoteTargetHandles) {
|
||||
AnimatorControllerWithResistance playbackController =
|
||||
@@ -2008,7 +2010,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
getScaleProgressDueToScroll()), mDragLengthFactor);
|
||||
}
|
||||
|
||||
if (notSwipingPipToHome) {
|
||||
if (notSwipingToHome) {
|
||||
TaskViewSimulator taskViewSimulator = remoteHandle.getTaskViewSimulator();
|
||||
if (setRecentsScroll) {
|
||||
taskViewSimulator.setScroll(mRecentsView.getScrollOffset());
|
||||
|
||||
Reference in New Issue
Block a user