Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d771c693 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-6d9d0859-70d0-4f47-805c-9d347aa427d6' into ub-launcher3-dorval-polish2 

* changes:
  Remove extra call to AllAppsContainerView#reset. am: 14709c6e
  Remove extra call to AllAppsContainerView#reset.
parents 20d27e51 ba99c5c1

src/com/android/launcher3/LauncherStateTransitionAnimation.java

+1 −3
Original line number Diff line number Diff line
@@ -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);

    }