diff options
| author | Tony Wickham <twickham@google.com> | 2019-07-12 00:27:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-12 00:27:42 +0000 |
| commit | a160e2bc78d28d9bbe34d9760bbb3c7194f89fcc (patch) | |
| tree | e74a116051e22962470ed1283342dd0336d64753 /src/com/android/launcher3/touch | |
| parent | 1fd52d9024a6ac3b1dd38f8518903e7c332bc750 (diff) | |
| parent | e1463f5580ed46a37816e586f75eab697d4c3a7b (diff) | |
| download | android_packages_apps_Trebuchet-a160e2bc78d28d9bbe34d9760bbb3c7194f89fcc.tar.gz android_packages_apps_Trebuchet-a160e2bc78d28d9bbe34d9760bbb3c7194f89fcc.tar.bz2 android_packages_apps_Trebuchet-a160e2bc78d28d9bbe34d9760bbb3c7194f89fcc.zip | |
Merge "Defer jumping to NORMAL state if overview is still peeking" into ub-launcher3-qt-r1-dev
Diffstat (limited to 'src/com/android/launcher3/touch')
| -rw-r--r-- | src/com/android/launcher3/touch/AbstractStateChangeTouchController.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 7252410e0..ae69f3b32 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -31,7 +31,6 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ValueAnimator; import android.os.SystemClock; -import android.util.Log; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; @@ -43,7 +42,6 @@ import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.AnimatorSetBuilder; -import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; @@ -513,11 +511,15 @@ public abstract class AbstractStateChangeTouchController shouldGoToTargetState = !reachedTarget; } if (shouldGoToTargetState) { - if (targetState != mStartState) { - logReachedState(logAction, targetState); - } - mLauncher.getStateManager().goToState(targetState, false /* animated */); + goToTargetState(targetState, logAction); + } + } + + protected void goToTargetState(LauncherState targetState, int logAction) { + if (targetState != mStartState) { + logReachedState(logAction, targetState); } + mLauncher.getStateManager().goToState(targetState, false /* animated */); } private void logReachedState(int logAction, LauncherState targetState) { |