Merge "Fix a couple issues with swiping up from home" into ub-launcher3-edmonton

This commit is contained in:
Tony Wickham
2018-05-18 16:50:47 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 13 deletions

View File

@@ -210,11 +210,13 @@ public abstract class AbstractStateChangeTouchController
@Override
public void onAnimationSuccess(Animator animation) {
cancelAtomicComponentsController();
mAtomicComponentsStartProgress = mCurrentAnimation.getProgressFraction();
long duration = (long) (getShiftRange() * 2);
mAtomicComponentsController = AnimatorPlaybackController.wrap(
createAtomicAnimForState(mFromState, mToState, duration), duration);
mAtomicComponentsController.dispatchOnStart();
if (mCurrentAnimation != null) {
mAtomicComponentsStartProgress = mCurrentAnimation.getProgressFraction();
long duration = (long) (getShiftRange() * 2);
mAtomicComponentsController = AnimatorPlaybackController.wrap(
createAtomicAnimForState(mFromState, mToState, duration), duration);
mAtomicComponentsController.dispatchOnStart();
}
}
});
}