diff options
| author | Tony Wickham <twickham@google.com> | 2019-06-11 16:02:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-11 16:02:43 -0700 |
| commit | f40276133f6aec6db72e44a06286f2629f240982 (patch) | |
| tree | 25a2bd8b8154d1b9afdb42b5976e863e616f2ae9 /quickstep/recents_ui_overrides/src | |
| parent | 7c5d95fdd200aaad3502e5bccd7ee230fd912abc (diff) | |
| parent | 070866931b1ea7b9f6035dfb497778ad261bf8b0 (diff) | |
| download | android_packages_apps_Trebuchet-f40276133f6aec6db72e44a06286f2629f240982.tar.gz android_packages_apps_Trebuchet-f40276133f6aec6db72e44a06286f2629f240982.tar.bz2 android_packages_apps_Trebuchet-f40276133f6aec6db72e44a06286f2629f240982.zip | |
Merge "Tweak spring stiffness/damping for attaching recents" into ub-launcher3-qt-dev
am: 070866931b
Change-Id: I71bf6a8dac3a4243b5ac67bdff9a829db0966b8e
Diffstat (limited to 'quickstep/recents_ui_overrides/src')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java index 7809e454a..bb5efd008 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -30,9 +30,6 @@ import static com.android.launcher3.anim.Interpolators.INSTANT; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.quickstep.WindowTransformSwipeHandler.RECENTS_ATTACH_DURATION; -import static androidx.dynamicanimation.animation.SpringForce.DAMPING_RATIO_LOW_BOUNCY; -import static androidx.dynamicanimation.animation.SpringForce.STIFFNESS_LOW; - import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -321,8 +318,8 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe if (mAttachToWindowTranslationXAnim == null) { mAttachToWindowTranslationXAnim = new SpringAnimation(recentsView, SpringAnimation.TRANSLATION_X).setSpring(new SpringForce() - .setDampingRatio(DAMPING_RATIO_LOW_BOUNCY) - .setStiffness(STIFFNESS_LOW)); + .setDampingRatio(0.8f) + .setStiffness(250)); } if (!recentsView.isShown() && animate) { recentsView.setTranslationX(fromTranslationX); |