From 0bbacc705cc7c11608549b5408e05a3c1726d074 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 23 Apr 2018 11:30:36 -0700
Subject: Moving some swipe up complete logic to when the handler is completed.

Bug: 76449024
Change-Id: I136e665495ab7164c79e1dfa0ef61090ba50fc7a
---
 .../src/com/android/quickstep/ActivityControlHelper.java    | 13 +------------
 .../com/android/quickstep/WindowTransformSwipeHandler.java  |  7 +++----
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'quickstep/src')

diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index b784c033f..84d97a926 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -79,8 +79,6 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
 
     ActivityInitListener createActivityInitListener(BiPredicate<T, Boolean> onInitListener);
 
-    void onOverviewShown(T activity);
-
     @Nullable
     T getCreatedActivity();
 
@@ -150,6 +148,7 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
         public void onSwipeUpComplete(Launcher activity) {
             // Re apply state in case we did something funky during the transition.
             activity.getStateManager().reapplyState();
+            DiscoveryBounce.showForOverviewIfNeeded(activity);
         }
 
         @Override
@@ -213,11 +212,6 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
             return new LauncherInitListener(onInitListener);
         }
 
-        @Override
-        public void onOverviewShown(Launcher launcher) {
-            DiscoveryBounce.showForOverviewIfNeeded(launcher);
-        }
-
         @Nullable
         @Override
         public Launcher getCreatedActivity() {
@@ -372,11 +366,6 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
             return new RecentsActivityTracker(onInitListener);
         }
 
-        @Override
-        public void onOverviewShown(RecentsActivity activity) {
-            // Do nothing.
-        }
-
         @Nullable
         @Override
         public RecentsActivity getCreatedActivity() {
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 248aa4181..7b09b8ffe 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -694,9 +694,6 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
             // If we haven't posted the transition end runnable, run it now
             finishTransitionRunnable.run();
         }
-        RecentsModel.getInstance(mContext).onOverviewShown(false, TAG);
-        mActivityControlHelper.onOverviewShown(mActivity);
-        doLogGesture(true /* toLauncher */);
     }
 
     private void setupLauncherUiAfterSwipeUpAnimation() {
@@ -708,9 +705,11 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
 
         // Animate the first icon.
         mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown */, true /* animate */);
-
         mRecentsView.setSwipeDownShouldLaunchApp(true);
 
+        RecentsModel.getInstance(mContext).onOverviewShown(false, TAG);
+
+        doLogGesture(true /* toLauncher */);
         reset();
     }
 
-- 
cgit v1.2.3