commit 24c81ad7b518ce28db7737668be6cb3947fefaf7
author Hilary Huo <hhuo@google.com> Tue Sep 29 23:32:33 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 29 23:32:33 2020 +0000
tree b65738f8b626c83de6dfa63c09b6bde2229d83e3
parent f8b70112641313bc410da92c61cb3e3eb377893f
parent de9a5e109d9636bd7e0f0e390658d33214c873d2

Merge "[pixel-search] Change Nasa actions title name" into ub-launcher3-master

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

diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 57c85cf..313ae5e 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -42,6 +42,7 @@
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTarget.ItemType;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 /**
@@ -138,7 +139,7 @@
         } else {
             RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
             ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-            searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.REMOTE_ACTION,
+            searchTargetEvent = getSearchTargetEvent(ItemType.ACTION,
                     eventType);
             searchTargetEvent.bundle = new Bundle();
             searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();

src_plugins/com/android/systemui/plugins/shared/SearchTarget.java

diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index 3780b20..3f0dc39 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -107,8 +107,9 @@
         SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
         PEOPLE(6, "People", ViewType.PEOPLE),
         SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL),
-        REMOTE_ACTION(8, "Remote Actions", ViewType.SHORTCUT),
-        SUGGEST(9, "Fallback Search", ViewType.SUGGEST);
+        ACTION(8, "Actions", ViewType.SHORTCUT),
+        SUGGEST(9, "Fallback Search", ViewType.SUGGEST),
+        CHROME_TAB(10, "Chrome Tab", ViewType.SHORTCUT);
 
         private final int mId;