PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge changes from topic "am-7be3af44-066d-47ef-8317-5b07072f0a58" into ub-launcher3-master

Browse Source 
* changes:
  [automerger] Fix a couple issues with swiping up from home am: 7de574175b
  Fix a couple issues with swiping up from home
This commit is contained in:
Tony Wickham
2018-05-18 16:50:47 +00:00
committed by Android (Google) Code Review
parent 50c0e60b00 e66cae1336
commit b2ceb6a2db
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+7 -5
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();
}
}
});
}