commit 86f8df6cf954ac27ab092b9ef8a4db3c9979c4cb
author Hilary Huo <hhuo@google.com> Thu Oct 08 18:43:51 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 08 18:43:51 2020 +0000
tree 13ea5239c6deecabcb10abfbb2a1ca5a369c8663
parent 4d19854b25a54599fe9b0ac8be9d60cf6c21d7ba
parent 16045060c35639aea85afc572bea768d16e6c9f9

Merge "[pixel-search] add escape hatch" into ub-launcher3-master

src/com/android/launcher3/model/data/RemoteActionItemInfo.java

diff --git a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
index 81f7f3a..d988bf9 100644
--- a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
@@ -61,4 +61,8 @@
     public boolean shouldStartInLauncher() {
         return mShouldStart;
     }
+
+    public boolean isEscapeHatch() {
+        return mToken.contains("item_type:[ESCAPE_HATCH]");
+    }
 }

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 c73eeae..6d9c86a 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -140,7 +140,7 @@
         RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
 
         applyFromRemoteActionInfo(itemInfo);
-        if (!loadIconFromResource()) {
+        if (itemInfo.isEscapeHatch() || !loadIconFromResource()) {
             UI_HELPER_EXECUTOR.post(() -> {
                 // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
                 // work.