diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-15 16:45:48 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-15 16:45:48 -0700 |
commit | a9a8a4221709cc3fda48fd80d4213d25183b8bf7 (patch) | |
tree | 005e7472b77670a8293194f12808ab14b3d35962 /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
parent | 9417686f73488ee3c2943bcd0498166c09cd4f0b (diff) | |
download | android_packages_apps_Trebuchet-a9a8a4221709cc3fda48fd80d4213d25183b8bf7.tar.gz android_packages_apps_Trebuchet-a9a8a4221709cc3fda48fd80d4213d25183b8bf7.tar.bz2 android_packages_apps_Trebuchet-a9a8a4221709cc3fda48fd80d4213d25183b8bf7.zip |
UI fixes to All apps pull up work
b/28917826
- nav bar change to light when top of the all apps container
passes y mid point of the status bar
- apps search edit box change when top of the all apps passes
the bottom of nav bar
- Restrict pull up to work only if the ACTION_DOWN event started
from the hotseat.
- Landscape: reverted old padding and margin. Only the interaction
is different.
- Tuning of the motion spec
- Animation duration respects fling speed more agressively.
- and many more small bugs...
Change-Id: Icde4093c41eeab8c9c6d9dc8b7d57adc3b171349
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
-rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index d62c62987..bdd026d30 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -249,10 +249,9 @@ public class LauncherStateTransitionAnimation { cancelAnimation(); final View contentView = toView.getContentView(); - + playCommonTransitionAnimations(toWorkspaceState, fromView, toView, + animated, initialized, animation, revealDuration, layerViews); if (!animated || !initialized) { - playCommonTransitionAnimations(toWorkspaceState, fromView, toView, - animated, initialized, animation, revealDuration, layerViews); toView.setTranslationX(0.0f); toView.setTranslationY(0.0f); @@ -276,9 +275,6 @@ public class LauncherStateTransitionAnimation { return null; } if (animType == CIRCULAR_REVEAL) { - playCommonTransitionAnimations(toWorkspaceState, fromView, toView, - animated, initialized, animation, revealDuration, layerViews); - // Setup the reveal view animation final View revealView = toView.getRevealView(); @@ -425,8 +421,6 @@ public class LauncherStateTransitionAnimation { } }); mAllAppsController.animateToAllApps(animation, revealDuration); - playCommonTransitionAnimations(toWorkspaceState, fromView, toView, - animated, initialized, animation, revealDuration, layerViews); dispatchOnLauncherTransitionPrepare(fromView, animated, false); dispatchOnLauncherTransitionPrepare(toView, animated, false); @@ -675,9 +669,9 @@ public class LauncherStateTransitionAnimation { boolean multiplePagesVisible = toWorkspaceState.hasMultipleVisiblePages; + playCommonTransitionAnimations(toWorkspaceState, fromView, toView, + animated, initialized, animation, revealDuration, layerViews); if (!animated || !initialized) { - playCommonTransitionAnimations(toWorkspaceState, fromView, toView, - animated, initialized, animation, revealDuration, layerViews); if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) { mAllAppsController.finishPullDown(); } @@ -694,12 +688,9 @@ public class LauncherStateTransitionAnimation { if (onCompleteRunnable != null) { onCompleteRunnable.run(); } - return null; } if (animType == CIRCULAR_REVEAL) { - playCommonTransitionAnimations(toWorkspaceState, fromView, toView, - animated, initialized, animation, revealDuration, layerViews); final View revealView = fromView.getRevealView(); final View contentView = fromView.getContentView(); @@ -880,8 +871,6 @@ public class LauncherStateTransitionAnimation { }); mAllAppsController.animateToWorkspace(animation, revealDuration); - playCommonTransitionAnimations(toWorkspaceState, fromView, toView, - animated, initialized, animation, revealDuration, layerViews); // Dispatch the prepare transition signal dispatchOnLauncherTransitionPrepare(fromView, animated, false); |