diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-27 18:28:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-27 18:28:36 +0000 |
| commit | 4752686389fd15de28dcf0151895523593d99500 (patch) | |
| tree | e6ba0682e994a32011515fd0b5e0825f5580f54a /src | |
| parent | b35bb6021c0a2a4f43c8edc78448e23ee8969fc8 (diff) | |
| parent | 14709c6eea128a900345f1109468d7a5b0ed900e (diff) | |
| download | android_packages_apps_Trebuchet-4752686389fd15de28dcf0151895523593d99500.tar.gz android_packages_apps_Trebuchet-4752686389fd15de28dcf0151895523593d99500.tar.bz2 android_packages_apps_Trebuchet-4752686389fd15de28dcf0151895523593d99500.zip | |
Merge "Remove extra call to AllAppsContainerView#reset." into ub-launcher3-dorval-polish
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index e7349f040..44b9704f2 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -387,7 +387,6 @@ public class LauncherStateTransitionAnimation { private void startAnimationToWorkspaceFromAllApps(final Workspace.State fromWorkspaceState, final Workspace.State toWorkspaceState, final boolean animated, int type, final Runnable onCompleteRunnable) { - final AllAppsContainerView appsView = mLauncher.getAppsView(); // No alpha anim from all apps PrivateTransitionCallbacks cb = new PrivateTransitionCallbacks(1f) { @Override @@ -417,12 +416,11 @@ public class LauncherStateTransitionAnimation { @Override void onTransitionComplete() { mLauncher.getUserEventDispatcher().resetElapsedContainerMillis(); - appsView.reset(); } }; // Only animate the search bar if animating to spring loaded mode from all apps startAnimationToWorkspaceFromOverlay(fromWorkspaceState, toWorkspaceState, - mLauncher.getStartViewForAllAppsRevealAnimation(), appsView, + mLauncher.getStartViewForAllAppsRevealAnimation(), mLauncher.getAppsView(), animated, type, onCompleteRunnable, cb); } |