commit 744a0fbeae8efaa942d21c61e25012d86f5ff81e
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 19 22:17:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 19 22:17:26 2020 +0000
tree 01c6ac9bb88f6ccd3b30d545cadc4a8b01580731
parent 29c79947ecf82f662d02004ba9a7289017fc0783
parent 71f24588c0a66449a0c68bcb360a8c671914ce75

Merge "Call click event on IME quick select for SearchResultIcon" into ub-launcher3-master

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

diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index 7d9f534..ea06d5b 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -81,6 +81,7 @@
 
     @Override
     public void handleSelection(int eventType) {
+        mLauncher.getItemOnClickListener().onClick(this);
         SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
                 new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
@@ -88,12 +89,12 @@
     @Override
     public void onClick(View view) {
         handleSelection(SearchTargetEvent.SELECT);
-        mLauncher.getItemOnClickListener().onClick(view);
     }
 
     @Override
     public boolean onLongClick(View view) {
-        handleSelection(SearchTargetEvent.LONG_PRESS);
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, SearchTargetEvent.LONG_PRESS).build());
         return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
     }
 }

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

diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index 6d85955..86ed436 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -104,7 +104,6 @@
         iconParams.height = mDeviceProfile.allAppsIconSizePx;
         iconParams.width = mDeviceProfile.allAppsIconSizePx;
         setOnClickListener(view -> handleSelection(SearchTargetEvent.SELECT));
-
     }