| commit | 8d8bde3b67dc02e998e0f149b33008a310c0bc8c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 08 19:24:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 08 19:24:21 2021 +0000 |
| tree | 3c0f1eb9fbff4d32b012ab9c34034ca7dd14c0db | |
| parent | 8b91fdfffbbbe5052b939dd937f6ec3c11c7d5d7 [diff] | |
| parent | 20e9383d2906b8065a87dff8c569d03ed0f7f44f [diff] |
Merge "Fixing itemInfoMatcher not working for folders" into sc-v2-dev am: 8d9eaf0c7d am: 20e9383d29 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15786950 Change-Id: I80e913d577d05201f80555cffd3f08d9ecccddc7
diff --git a/src/com/android/launcher3/util/ItemInfoMatcher.java b/src/com/android/launcher3/util/ItemInfoMatcher.java index e8ba28f..ab3083d 100644 --- a/src/com/android/launcher3/util/ItemInfoMatcher.java +++ b/src/com/android/launcher3/util/ItemInfoMatcher.java
@@ -32,6 +32,11 @@ */ public interface ItemInfoMatcher { + /** + * Empty component used for match testing + */ + ComponentName EMPTY_COMPONENT = new ComponentName("", ""); + boolean matches(ItemInfo info, ComponentName cn); /** @@ -40,7 +45,7 @@ default boolean matchesInfo(ItemInfo info) { if (info != null) { ComponentName cn = info.getTargetComponent(); - return cn != null && matches(info, cn); + return matches(info, cn != null ? cn : EMPTY_COMPONENT); } else { return false; }