From 4c021ee1bca85957cb63bff8d948ff9de7adc8a4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 14 Feb 2018 13:13:41 -0800
Subject: [PATCH] Temporarily disable back button deferral of start animation.

Bug: 73356768
Change-Id: I156b0e6db0ac51a325a3a76118ce8efd01e50419
---
 .../com/android/quickstep/OtherActivityTouchConsumer.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
index b9799673fc..a2c54f1786 100644
--- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
+++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
@@ -124,7 +124,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
 
                 // Start the window animation on down to give more time for launcher to draw if the
                 // user didn't start the gesture over the back button
-                if (mDownHitTarget != HIT_TARGET_BACK && !isUsingScreenShot()) {
+                if (!isUsingScreenShot()) {
                     startTouchTrackingForWindowAnimation();
                 }
 
@@ -166,10 +166,6 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
 
                         if (isUsingScreenShot()) {
                             startTouchTrackingForScreenshotAnimation();
-                        } else if (mDownHitTarget == HIT_TARGET_BACK) {
-                            // If the window animation was deferred on DOWN due to it starting over
-                            // the back button, then start it now
-                            startTouchTrackingForWindowAnimation();
                         }
 
                         notifyGestureStarted();