diff options
author | Tony Wickham <twickham@google.com> | 2019-05-31 10:21:28 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2019-05-31 10:21:28 -0700 |
commit | 436d5971b1b84e491f8e15ee9bbd8c2253e5f637 (patch) | |
tree | 43a52015507eff98a8e8be32759ebcb22c536fbc /quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | |
parent | 1d7b2a0672edb497b2fd2784cebd04393428713c (diff) | |
download | android_packages_apps_Trebuchet-436d5971b1b84e491f8e15ee9bbd8c2253e5f637.tar.gz android_packages_apps_Trebuchet-436d5971b1b84e491f8e15ee9bbd8c2253e5f637.tar.bz2 android_packages_apps_Trebuchet-436d5971b1b84e491f8e15ee9bbd8c2253e5f637.zip |
Don't recreate the launcher animation controller if gesture ended
This can happen if we get onApplyWindowInsets() after onGestureEnded().
In that case, we can get into some bad states because the running
animation is overwritten and thus can't be canceled.
Bug: 134096917
Bug: 133806285
Change-Id: Ic517d68a46a4446ca382445df1ba62c26e8243ad
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 0d0478ae0..030d0dd5c 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -106,7 +106,6 @@ import com.android.quickstep.views.TaskView; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.InputConsumerController; import com.android.systemui.shared.system.LatencyTrackerCompat; -import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat; import com.android.systemui.shared.system.WindowCallbacksCompat; @@ -647,6 +646,9 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> } private void buildAnimationController() { + if (mStateCallback.hasStates(STATE_GESTURE_COMPLETED)) { + return; + } initTransitionEndpoints(mActivity.getDeviceProfile()); mAnimationFactory.createActivityController(mTransitionDragLength); } |