aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +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

21
src/com/android/launcher3/LauncherStateTransitionAnimation.java
View File

@@ -524,11 +524,13 @@ public class LauncherStateTransitionAnimation {
// Cancel the current animation
cancelAnimation();
boolean multiplePagesVisible = toWorkspaceState.hasMultipleVisiblePages;
playCommonTransitionAnimations(toWorkspaceState, fromWorkspace, null,
animated, animated, animation, revealDuration, layerViews);
if (animated) {
dispatchOnLauncherTransitionPrepare(fromWorkspace, animated, true);
dispatchOnLauncherTransitionPrepare(fromWorkspace, animated, multiplePagesVisible);
final AnimatorSet stateAnimation = animation;
final Runnable startAnimRunnable = new Runnable() {
@@ -577,7 +579,7 @@ public class LauncherStateTransitionAnimation {
fromWorkspace.post(startAnimRunnable);
mCurrentAnimation = animation;
} else /* if (!animated) */ {
dispatchOnLauncherTransitionPrepare(fromWorkspace, animated, true);
dispatchOnLauncherTransitionPrepare(fromWorkspace, animated, multiplePagesVisible);
dispatchOnLauncherTransitionStart(fromWorkspace, animated, true);
dispatchOnLauncherTransitionEnd(fromWorkspace, animated, true);
@@ -615,6 +617,8 @@ public class LauncherStateTransitionAnimation {
// Cancel the current animation
cancelAnimation();
boolean multiplePagesVisible = toWorkspaceState.hasMultipleVisiblePages;
playCommonTransitionAnimations(toWorkspaceState, fromView, toView,
animated, initialized, animation, revealDuration, layerViews);
@@ -725,8 +729,8 @@ public class LauncherStateTransitionAnimation {
}
}
dispatchOnLauncherTransitionPrepare(fromView, animated, true);
dispatchOnLauncherTransitionPrepare(toView, animated, true);
dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible);
dispatchOnLauncherTransitionPrepare(toView, animated, multiplePagesVisible);
animation.addListener(new AnimatorListenerAdapter() {
@Override
@@ -789,10 +793,10 @@ public class LauncherStateTransitionAnimation {
return animation;
} else /* if (!(animated && initialized)) */ {
fromView.setVisibility(View.GONE);
dispatchOnLauncherTransitionPrepare(fromView, animated, true);
dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible);
dispatchOnLauncherTransitionStart(fromView, animated, true);
dispatchOnLauncherTransitionEnd(fromView, animated, true);
dispatchOnLauncherTransitionPrepare(toView, animated, true);
dispatchOnLauncherTransitionPrepare(toView, animated, multiplePagesVisible);
dispatchOnLauncherTransitionStart(toView, animated, true);
dispatchOnLauncherTransitionEnd(toView, animated, true);
pCb.onTransitionComplete();
@@ -809,10 +813,11 @@ public class LauncherStateTransitionAnimation {
/**
* Dispatches the prepare-transition event to suitable views.
*/
void dispatchOnLauncherTransitionPrepare(View v, boolean animated, boolean toWorkspace) {
void dispatchOnLauncherTransitionPrepare(View v, boolean animated,
boolean multiplePagesVisible) {
if (v instanceof LauncherTransitionable) {
((LauncherTransitionable) v).onLauncherTransitionPrepare(mLauncher, animated,
toWorkspace);
multiplePagesVisible);
}
}