commit b187a925998a1244af8f82aec5e7c37194af70e3
author Vadim Tryshev <vadimt@google.com> Wed Sep 05 23:29:44 2018 +0000
committer Vadim Tryshev <vadimt@google.com> Wed Sep 05 23:29:44 2018 +0000
tree 59393e0ee19788959fb5beb4be07983dc5f4189e
parent af34f4115b4af62e69fd2bca2327cb0da15100f7

Revert "Avoiding crash upon pressing Alt-Tab"

This reverts commit af34f4115b4af62e69fd2bca2327cb0da15100f7.

Reason for revert: Broke swipe from app

Change-Id: I2c6ff179c9731205633aa96395719f544d3575fb

quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java

diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
index 27550d1..c3e0568 100644
--- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
+++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
@@ -24,7 +24,6 @@
 
 import static com.android.systemui.shared.system.ActivityManagerWrapper
         .CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
-import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 
 import android.annotation.TargetApi;
@@ -96,7 +95,6 @@
     private VelocityTracker mVelocityTracker;
     private MotionEventQueue mEventQueue;
     private boolean mIsGoingToHome;
-    private final @HitTarget int mDownHitTarget;
 
     public OtherActivityTouchConsumer(Context base, RunningTaskInfo runningTaskInfo,
             RecentsModel recentsModel, Intent homeIntent, ActivityControlHelper activityControl,
@@ -115,7 +113,6 @@
         mIsDeferredDownTarget = activityControl.deferStartingActivity(downHitTarget);
         mOverviewCallbacks = overviewCallbacks;
         mTaskOverlayFactory = taskOverlayFactory;
-        mDownHitTarget = downHitTarget;
     }
 
     @Override
@@ -125,7 +122,7 @@
 
     @Override
     public void accept(MotionEvent ev) {
-        if (mVelocityTracker == null || mDownHitTarget == HIT_TARGET_NONE) {
+        if (mVelocityTracker == null) {
             return;
         }
         switch (ev.getActionMasked()) {
@@ -282,8 +279,6 @@
      * the animation can still be running.
      */
     private void finishTouchTracking(MotionEvent ev) {
-        if (mDownHitTarget == HIT_TARGET_NONE) return;
-
         if (mPassedInitialSlop && mInteractionHandler != null) {
             mInteractionHandler.updateDisplacement(getDisplacement(ev) - mStartDisplacement);
 
@@ -356,8 +351,6 @@
 
     @Override
     public void onQuickStep(MotionEvent ev) {
-        if (mDownHitTarget == HIT_TARGET_NONE) return;
-
         if (mIsDeferredDownTarget) {
             // Deferred gesture, start the animation and gesture tracking once we pass the actual
             // touch slop
@@ -451,8 +444,7 @@
             } else {
                 TraceHelper.partitionSection("RecentsController", "Received");
                 mInteractionHandler.onRecentsAnimationStart(mController, mTargets,
-                        mHomeContentInsets, mMinimizedHomeBounds,
-                        mDownHitTarget != HIT_TARGET_NONE ? mDownPos : null);
+                        mHomeContentInsets, mMinimizedHomeBounds, mDownPos);
             }
         }
     }