diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-07-24 12:19:21 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-07-24 12:19:21 -0700 |
| commit | 14709c6eea128a900345f1109468d7a5b0ed900e (patch) | |
| tree | b6d5e78342cbb1f5d029fd872fb36aab8e5476f9 /src | |
| parent | 1091e538b4622beb8fade0ca0b050f25019c4fd6 (diff) | |
| download | android_packages_apps_Trebuchet-14709c6eea128a900345f1109468d7a5b0ed900e.tar.gz android_packages_apps_Trebuchet-14709c6eea128a900345f1109468d7a5b0ed900e.tar.bz2 android_packages_apps_Trebuchet-14709c6eea128a900345f1109468d7a5b0ed900e.zip | |
Remove extra call to AllAppsContainerView#reset.
We were calling reset twice:
* LauncherStateTransitionAnimation#startAnimationToWorkspaceFromAllApps
* AllAppsTransitionController#finishPullDown
Bug: 63711551
Change-Id: Ib695332f537c270ecd3a67c4369fe90b8761032a
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); } |