aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 08:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call onLauncherTransitionPrepare() and End() from pinch.

Browse Source 
This makes the pinch transition more consistent with other transitions.
One immediate benefit of this is that it updates adjacent overview
panels during pinch, regardless of whether they are completely visible.

Previously the adjacent panels' alphas weren't always reset to 0.
Specifically, if you made a small pinch from workspace, which
canceled and went back to workspace, adjacent pages retained a
slightly visible panel.

Bug: 27676309
Change-Id: I7e79fddec31cd649e0811e4524b9a9a501c627f9
This commit is contained in:
Tony Wickham
2016-04-05 18:36:36 -07:00
parent 8f7ead3e94
commit f898b970cc
6 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/launcher3/PinchAnimationManager.java
View File

@@ -51,10 +51,10 @@ public class PinchAnimationManager {
private static final int THRESHOLD_ANIM_DURATION = 150;
private static final LinearInterpolator INTERPOLATOR = new LinearInterpolator();
private static int INDEX_PAGE_INDICATOR = 0;
private static int INDEX_HOTSEAT = 1;
private static int INDEX_OVERVIEW_PANEL_BUTTONS = 2;
private static int INDEX_SCRIM = 3;
private static final int INDEX_PAGE_INDICATOR = 0;
private static final int INDEX_HOTSEAT = 1;
private static final int INDEX_OVERVIEW_PANEL_BUTTONS = 2;
private static final int INDEX_SCRIM = 3;
private final Animator[] mAnimators = new Animator[4];
@@ -93,20 +93,21 @@ public class PinchAnimationManager {
}
ValueAnimator animator = ValueAnimator.ofFloat(currentProgress, toProgress);
animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
float pinchProgress = (Float) animation.getAnimatedValue();
setAnimationProgress(pinchProgress);
thresholdManager.updateAndAnimatePassedThreshold(pinchProgress,
PinchAnimationManager.this);
}
}
@Override
public void onAnimationUpdate(ValueAnimator animation) {
float pinchProgress = (Float) animation.getAnimatedValue();
setAnimationProgress(pinchProgress);
thresholdManager.updateAndAnimatePassedThreshold(pinchProgress,
PinchAnimationManager.this);
}
}
);
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mIsAnimating = false;
thresholdManager.reset();
mWorkspace.onLauncherTransitionEnd(mLauncher, false, true);
}
});
animator.setDuration(duration).start();
@@ -129,10 +130,6 @@ public class PinchAnimationManager {
mWorkspace.setScaleY(interpolatedScale);
mWorkspace.setTranslationY(interpolatedTranslationY);
setOverviewPanelsAlpha(1f - interpolatedProgress, 0);
// Make sure adjacent pages, except custom content page, are visible while scaling.
mWorkspace.setCustomContentVisibility(View.INVISIBLE);
mWorkspace.invalidate();
}
/**
@@ -168,7 +165,7 @@ public class PinchAnimationManager {
// Passing threshold 3 ends the pinch and snaps to the new state.
if (startState == OVERVIEW && goingTowards == NORMAL) {
mLauncher.showWorkspace(true);
mWorkspace.snapToPage(mWorkspace.getPageNearestToCenterOfScreen());
mWorkspace.snapToPage(mWorkspace.getCurrentPage());
} else if (startState == NORMAL && goingTowards == OVERVIEW) {
mLauncher.showOverviewMode(true);
}