commit adca2fc1e94bfcff4f5f563b525d303589079f6b
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 10 00:55:00 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 10 00:55:00 2018 +0000
tree 8306442639bad3a077b1169b6b262f508120c78f
parent 00092efbdfb2149af517f2624bfcccb64e3c5861
parent 72289860ee5e4a817f1bb4e99710a10eea2f9a57

Merge "Fixing workspace card shifted when going to home." into ub-launcher3-master

quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 9ea30f0..9a5640b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -71,6 +71,8 @@
             .getBoolean("pref_scroll_to_first_task", false);
         mIsRecentsScrollingToFirstTask = mLauncher.isInState(NORMAL) && toState == OVERVIEW
                 && settingEnabled;
+        // TODO: Instead of animating the workspace translationX, move the contents
+        mWorkspaceCard.setWorkspaceScrollingEnabled(mIsRecentsScrollingToFirstTask);
 
         // Scroll to the workspace card before changing to the NORMAL state.
         int currPage = mRecentsView.getCurrentPage();
@@ -89,11 +91,6 @@
         progressAnim.addListener(new AnimationSuccessListener() {
 
             @Override
-            public void onAnimationStart(Animator animation) {
-                mWorkspaceCard.setWorkspaceScrollingEnabled(mIsRecentsScrollingToFirstTask);
-            }
-
-            @Override
             public void onAnimationSuccess(Animator animator) {
                 mWorkspaceCard.setWorkspaceScrollingEnabled(toState == OVERVIEW);
                 mRecentsView.setCurrentPage(mRecentsView.getPageNearestToCenterOfScreen());