diff options
| author | Tony Wickham <twickham@google.com> | 2018-06-21 21:55:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-21 21:55:31 +0000 |
| commit | 07fcd3bea29965239a9756b05e3572e0808abd75 (patch) | |
| tree | a315017355eee2ba8ebd100f0533e4738246352e /src/com/android/launcher3 | |
| parent | 1aaaac834347cf8b99403d79a9fae80d7d0173d4 (diff) | |
| parent | 520ffec9d387c634c3dbcef1b510616bf29d66a3 (diff) | |
| download | android_packages_apps_Trebuchet-07fcd3bea29965239a9756b05e3572e0808abd75.tar.gz android_packages_apps_Trebuchet-07fcd3bea29965239a9756b05e3572e0808abd75.tar.bz2 android_packages_apps_Trebuchet-07fcd3bea29965239a9756b05e3572e0808abd75.zip | |
Merge "When controlling atomic components, bound to remaining progress" into ub-launcher3-edmonton-polish
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/touch/AbstractStateChangeTouchController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index d478d4865..55f850c8d 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -283,7 +283,9 @@ public abstract class AbstractStateChangeTouchController protected void updateProgress(float fraction) { mCurrentAnimation.setPlayFraction(fraction); if (mAtomicComponentsController != null) { - mAtomicComponentsController.setPlayFraction(fraction - mAtomicComponentsStartProgress); + // Make sure we don't divide by 0, and have at least a small runway. + float start = Math.min(mAtomicComponentsStartProgress, 0.9f); + mAtomicComponentsController.setPlayFraction((fraction - start) / (1 - start)); } maybeUpdateAtomicAnim(mFromState, mToState, fraction); } |