commit fe62454efa92c8e359586a4da95a7e6873801997
author Tony Wickham <twickham@google.com> Tue Mar 13 16:26:44 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 13 16:26:44 2018 +0000
tree 92a40244752e46ca3ea9d0f4cbfc8164acceaea6
parent 329ce74b7c77caa9c6901716e7ffe21c0ad0b8db
parent 1e6eaea0a4a36a79c7827a9f1a01b93be078dfbe

Merge "Improve quick scrub" into ub-launcher3-master

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

diff --git a/quickstep/src/com/android/launcher3/uioverrides/OverviewSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/OverviewSwipeController.java
index 958091b..eb14d60 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/OverviewSwipeController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/OverviewSwipeController.java
@@ -133,8 +133,7 @@
                 mSwipeDownEnabled = true;
 
                 View view = mRecentsView.getChildAt(mRecentsView.getCurrentPage());
-                if (mLauncher.getDragLayer().isEventOverView(view, ev) &&
-                        view instanceof TaskView) {
+                if (view instanceof TaskView && mLauncher.getDragLayer().isEventOverView(view, ev)) {
                     // The tile can be dragged down to open the task.
                     mTaskBeingDragged = (TaskView) view;
                     directionsToDetectScroll = SwipeDetector.DIRECTION_BOTH;