From f496ea46342bd7420c3cf453bcbd5c12f7ecfc5d Mon Sep 17 00:00:00 2001 From: Jonathan Miranda Date: Wed, 29 Jul 2020 19:03:29 +0000 Subject: [PATCH] Revert "Fix bug where double swipe gets us stuck in Hint state while in Overview." This reverts commit a8c08584a7bb295a2f14eafd2923a2688d3e3626. Reason for revert: "caused a regression with quick switch from home: if you start the gesture then swipe back to the left, it ends up launching the task anyway" Change-Id: I8e12e2de46b6fc6a3faeb0336762da08080c61d6 --- .../src/com/android/quickstep/BaseSwipeUpHandlerV2.java | 1 - .../src/com/android/quickstep/SwipeUpAnimationLogic.java | 1 - .../src/com/android/quickstep/views/TaskMenuView.java | 1 - src/com/android/launcher3/anim/AlphaUpdateListener.java | 3 +-- .../android/launcher3/anim/AnimationSuccessListener.java | 8 -------- .../launcher3/anim/AnimatorPlaybackController.java | 1 - src/com/android/launcher3/statemanager/StateManager.java | 1 - 7 files changed, 1 insertion(+), 15 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java index e084de1acb..a3f1dd4c5f 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java @@ -1090,7 +1090,6 @@ public abstract class BaseSwipeUpHandlerV2, Q exte anim.addAnimatorListener(new AnimationSuccessListener() { @Override public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); if (mActivity != null) { removeLiveTileOverlay(); } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java index 07faab7aeb..e54a21c073 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java @@ -287,7 +287,6 @@ public abstract class SwipeUpAnimationLogic { @Override public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); mHomeAnim.dispatchOnStart(); } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java index 9b2048e4ac..8b49f2c212 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java @@ -282,7 +282,6 @@ public class TaskMenuView extends AbstractFloatingView { mOpenCloseAnimator.addListener(new AnimationSuccessListener() { @Override public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); setVisibility(VISIBLE); } diff --git a/src/com/android/launcher3/anim/AlphaUpdateListener.java b/src/com/android/launcher3/anim/AlphaUpdateListener.java index 69716eabf1..eabd283699 100644 --- a/src/com/android/launcher3/anim/AlphaUpdateListener.java +++ b/src/com/android/launcher3/anim/AlphaUpdateListener.java @@ -46,8 +46,7 @@ public class AlphaUpdateListener extends AnimationSuccessListener } @Override - public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); + public void onAnimationStart(Animator arg0) { // We want the views to be visible for animation, so fade-in/out is visible mView.setVisibility(View.VISIBLE); } diff --git a/src/com/android/launcher3/anim/AnimationSuccessListener.java b/src/com/android/launcher3/anim/AnimationSuccessListener.java index b83417c2eb..9905e81638 100644 --- a/src/com/android/launcher3/anim/AnimationSuccessListener.java +++ b/src/com/android/launcher3/anim/AnimationSuccessListener.java @@ -19,8 +19,6 @@ package com.android.launcher3.anim; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import androidx.annotation.CallSuper; - /** * Extension of {@link AnimatorListenerAdapter} for listening for non-cancelled animations */ @@ -28,12 +26,6 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter { protected boolean mCancelled = false; - @Override - @CallSuper - public void onAnimationStart(Animator animation) { - mCancelled = false; - } - @Override public void onAnimationCancel(Animator animation) { mCancelled = true; diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java index 31e0418571..ea0ff8b687 100644 --- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java +++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java @@ -335,7 +335,6 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL @Override public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); mCancelled = false; mDispatched = false; } diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java index f1e7f166e5..60b87d984b 100644 --- a/src/com/android/launcher3/statemanager/StateManager.java +++ b/src/com/android/launcher3/statemanager/StateManager.java @@ -315,7 +315,6 @@ public class StateManager> { @Override public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); // Change the internal state only when the transition actually starts onStateTransitionStart(state); }