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

AllAppsTransitionController always use LauncherStateTransitionAnimation

Browse Source 
b/30375760

Change-Id: Iee2f8060e4d272d276ddd5d40b4bc6053e8c7778
This commit is contained in:
Hyunyoung Song
2016-07-27 10:55:51 -07:00
parent 10717bfcae
commit 9dcf0a3ef7
4 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,8 @@ public class LauncherStateTransitionAnimation {
Log.e(TAG, "Unexpected call to startAnimationToWorkspace");
}
if (fromState == Launcher.State.APPS || fromState == Launcher.State.APPS_SPRING_LOADED) {
if (fromState == Launcher.State.APPS || fromState == Launcher.State.APPS_SPRING_LOADED
|| mAllAppsController.isTransitioning()) {
int animType = CIRCULAR_REVEAL;
if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
animType = PULLUP;
@@ -434,7 +435,7 @@ public class LauncherStateTransitionAnimation {
pCb.onTransitionComplete();
}
});
mAllAppsController.animateToAllApps(animation, revealDuration, false);
mAllAppsController.animateToAllApps(animation, revealDuration);
dispatchOnLauncherTransitionPrepare(fromView, animated, false);
dispatchOnLauncherTransitionPrepare(toView, animated, false);
@@ -898,9 +899,8 @@ public class LauncherStateTransitionAnimation {
@Override
public void onAnimationEnd(Animator animation) {
if (canceled) return;
dispatchOnLauncherTransitionEnd(fromView, animated, false);
dispatchOnLauncherTransitionEnd(toView, animated, false);
dispatchOnLauncherTransitionEnd(fromView, animated, true);
dispatchOnLauncherTransitionEnd(toView, animated, true);
// Run any queued runnables
if (onCompleteRunnable != null) {
onCompleteRunnable.run();
@@ -918,7 +918,7 @@ public class LauncherStateTransitionAnimation {
}
});
mAllAppsController.animateToWorkspace(animation, revealDuration, false);
mAllAppsController.animateToWorkspace(animation, revealDuration);
// Dispatch the prepare transition signal
dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible);