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 | d771c6930f7dc9100cf04d1cb8dec159dd2c8b42 (patch) | |
| tree | 008047dca14f1ad7fae25e4e4ff2d43be2fe40b8 | |
| parent | 20d27e513c9a5d8b40c1f9e64c05f5294f280794 (diff) | |
| parent | ba99c5c1fe541a81b00ad727c0c7e3df7a7fda91 (diff) | |
| download | android_packages_apps_Trebuchet-d771c6930f7dc9100cf04d1cb8dec159dd2c8b42.tar.gz android_packages_apps_Trebuchet-d771c6930f7dc9100cf04d1cb8dec159dd2c8b42.tar.bz2 android_packages_apps_Trebuchet-d771c6930f7dc9100cf04d1cb8dec159dd2c8b42.zip | |
Merge changes from topic 'am-6d9d0859-70d0-4f47-805c-9d347aa427d6' into ub-launcher3-dorval-polish2
* changes:
Remove extra call to AllAppsContainerView#reset. am: 14709c6eea
Remove extra call to AllAppsContainerView#reset.
| -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); } |