aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 17:06:49 +00:00
Code Issues 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

10
quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java
View File

@@ -189,14 +189,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
if (isFling && expectedDuration != 0) {
// Update all apps interpolator to add a bit of overshoot starting from currFraction
final float currFraction = mCurrentAnimation.getProgressFraction();
mAllAppsInterpolatorWrapper.baseInterpolator
= new OvershootInterpolator(Math.min(Math.abs(velocity) / 3, 3f)) {
@Override
public float getInterpolation(float t) {
return super.getInterpolation(t) + ((1 - t) * currFraction);
}
};
animator.setFloatValues(0, 1);
mAllAppsInterpolatorWrapper.baseInterpolator = Interpolators.clampToProgress(
new OvershootInterpolator(Math.min(Math.abs(velocity), 3f)), currFraction, 1);
animator.setDuration(Math.min(expectedDuration, ATOMIC_DURATION))
.setInterpolator(LINEAR);
}

12
src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
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();
}
}
});
}