PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoiding updating task via scroll if RectF spring animation is running" into tm-dev am: 689b000316 am: 595c9c37f5 am: 153c553181

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

Change-Id: I72a51b0d2f756e9710058beb0b820dbbb52b15d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sunny Goyal
2022-05-24 22:23:28 +00:00
committed by Automerger Merge Worker
parent 6eabe826f5 153c553181
commit cfbb12e29d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+6 -4
View File
@@ -1996,9 +1996,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
* Applies the transform on the recents animation * Applies the transform on the recents animation
*/ */
protected void applyScrollAndTransform() { protected void applyScrollAndTransform() {
// No need to apply any transform if there is ongoing swipe-pip-to-home animator since // No need to apply any transform if there is ongoing swipe-to-home animator
// that animator handles the leash solely. // swipe-to-pip handles the leash solely
boolean notSwipingPipToHome = mRecentsAnimationTargets != null && !mIsSwipingPipToHome; // swipe-to-icon animation is handled by RectFSpringAnim anim
boolean notSwipingToHome = mRecentsAnimationTargets != null
&& mGestureState.getEndTarget() != HOME;
boolean setRecentsScroll = mRecentsViewScrollLinked && mRecentsView != null; boolean setRecentsScroll = mRecentsViewScrollLinked && mRecentsView != null;
for (RemoteTargetHandle remoteHandle : mRemoteTargetHandles) { for (RemoteTargetHandle remoteHandle : mRemoteTargetHandles) {
AnimatorControllerWithResistance playbackController = AnimatorControllerWithResistance playbackController =
@@ -2008,7 +2010,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
getScaleProgressDueToScroll()), mDragLengthFactor); getScaleProgressDueToScroll()), mDragLengthFactor);
} }
if (notSwipingPipToHome) { if (notSwipingToHome) {
TaskViewSimulator taskViewSimulator = remoteHandle.getTaskViewSimulator(); TaskViewSimulator taskViewSimulator = remoteHandle.getTaskViewSimulator();
if (setRecentsScroll) { if (setRecentsScroll) {
taskViewSimulator.setScroll(mRecentsView.getScrollOffset()); taskViewSimulator.setScroll(mRecentsView.getScrollOffset());