commit 2c86122fa4fed91a02faad25dd40b2da31766d1d
author Samuel Fufa <sfufa@google.com> Wed Nov 11 09:48:24 2020 -0600
committer Sunny Goyal <sunnygoyal@google.com> Tue Nov 17 18:34:46 2020 +0000
tree 6f7bd377a311684a056455df40813f015e3f9261
parent 54834b0909b164dd65e006268485fdd80b58677e

Resolve auto close on widget swipe

Bug: 172891360
Test: Manual
Change-Id: Icb384b6dc5ec9a29b6a9a7811b862a2d83ca11a7
(cherry picked from commit 5fa6f3ce503cde51687985ebc9dee6f163b9b1ea)

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index f235199..1dc10fe 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -132,7 +132,7 @@
      * Returns the child adapter item with IME launch focus.
      */
     public AdapterItem getFocusedChild() {
-        if (mAdapterItems.size() == 0 || getFocusedChildIndex() != -1) {
+        if (mAdapterItems.size() == 0 || getFocusedChildIndex() == -1) {
             return null;
         }
         return mAdapterItems.get(getFocusedChildIndex());

src/com/android/launcher3/views/SearchResultWidget.java

diff --git a/src/com/android/launcher3/views/SearchResultWidget.java b/src/com/android/launcher3/views/SearchResultWidget.java
index 7d53955..f76de3d 100644
--- a/src/com/android/launcher3/views/SearchResultWidget.java
+++ b/src/com/android/launcher3/views/SearchResultWidget.java
@@ -150,12 +150,14 @@
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         mLongPressHelper.onTouchEvent(ev);
         mClickDetector.onTouchEvent(ev);
-        if (ev.getAction() == MotionEvent.ACTION_UP && !mLongPressHelper.hasPerformedLongPress()) {
-            handleSelection(SearchTargetEvent.CHILD_SELECT);
-        }
-        return super.onInterceptTouchEvent(ev);
+        return mLongPressHelper.hasPerformedLongPress();
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        mLongPressHelper.onTouchEvent(ev);
+        return true;
+    }
 
     @Override
     public void cancelLongPress() {