diff options
author | Jonathan Miranda <jonmiranda@google.com> | 2019-01-05 00:04:20 +0000 |
---|---|---|
committer | Jonathan Miranda <jonmiranda@google.com> | 2019-01-05 00:04:20 +0000 |
commit | 2bdac8f7e53cb933b84a63799aa6195dd9486b8d (patch) | |
tree | f969314b979823f63dcf8b03ce8e1db01eda44dd /src/com/android/launcher3/touch | |
parent | e018711aac98522f2b24cb01cd95e17125aaf178 (diff) | |
download | android_packages_apps_Trebuchet-2bdac8f7e53cb933b84a63799aa6195dd9486b8d.tar.gz android_packages_apps_Trebuchet-2bdac8f7e53cb933b84a63799aa6195dd9486b8d.tar.bz2 android_packages_apps_Trebuchet-2bdac8f7e53cb933b84a63799aa6195dd9486b8d.zip |
Revert "Add spring to shelf for home <-> overview <-> all apps state transitions."
This reverts commit e018711aac98522f2b24cb01cd95e17125aaf178.
Reason for revert: investigating crash
Change-Id: I157b61a9f1bd46e2fcd3f2f883d3b5c23ca314af
Diffstat (limited to 'src/com/android/launcher3/touch')
-rw-r--r-- | src/com/android/launcher3/touch/AbstractStateChangeTouchController.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index bb143288c..a7bd243a6 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -24,7 +24,6 @@ import static com.android.launcher3.LauncherStateManager.ATOMIC_COMPONENT; import static com.android.launcher3.LauncherStateManager.NON_ATOMIC_COMPONENT; import static com.android.launcher3.Utilities.SINGLE_FRAME_MS; import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity; -import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -46,7 +45,6 @@ import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.AnimatorSetBuilder; import com.android.launcher3.compat.AccessibilityManagerCompat; -import com.android.launcher3.config.FeatureFlags; 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; @@ -430,8 +428,8 @@ public abstract class AbstractStateChangeTouchController maybeUpdateAtomicAnim(mFromState, targetState, targetState == mToState ? 1f : 0f); updateSwipeCompleteAnimation(anim, Math.max(duration, getRemainingAtomicDuration()), targetState, velocity, fling); - mCurrentAnimation.dispatchOnStartWithVelocity(endProgress, velocity); - if (fling && targetState == LauncherState.ALL_APPS && !QUICKSTEP_SPRINGS.get()) { + mCurrentAnimation.dispatchOnStart(); + if (fling && targetState == LauncherState.ALL_APPS) { mLauncher.getAppsView().addSpringFromFlingUpdateListener(anim, velocity); } anim.start(); |