Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7298380 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-1abed5a8-2763-4f96-8333-2a5ce35c98d3" into ub-launcher3-master 

* changes:
  [automerger] When controlling atomic components, bound to remaining progress am: 520ffec9
  When controlling atomic components, bound to remaining progress
parents 4a724052 7c2b0c01

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

    }