commit ecb053259785827daa50d235a915b17642ffee99
author Federico Baron <fbaron@google.com> Mon Feb 13 13:52:41 2023 -0800
committer Federico Baron <fbaron@google.com> Mon Feb 13 13:53:55 2023 -0800
tree 57107658f6d026e3ae60492845de6eac84a968bd
parent 5147b1d5099a0d6155080fda38a76e6ee1a981c4

Fix wrong widget appearing in widget picker for tablet

The wrong widget would appear in tablets because we were finding the widgets by PackageUserKey title instead of comparing the PackageUserKey objects themselves.

Fix: 269160189
Test: Turn on LARGE_SCREEN_WIDGET_PICKER and verify that in landscape mode in tablet clicking the battery header shows the correct widget
Change-Id: I4f17ba057d9287fc83e3b1e0072cacf0eee3deef

src/com/android/launcher3/popup/PopupDataProvider.java

diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 69c96ff..44e3dd6 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -242,7 +242,7 @@
     public WidgetsListContentEntry getSelectedAppWidgets(PackageUserKey packageUserKey) {
         return (WidgetsListContentEntry) mAllWidgets.stream()
                 .filter(row -> row instanceof WidgetsListContentEntry
-                        && row.mPkgItem.packageName.equals(packageUserKey.mPackageName))
+                        && PackageUserKey.fromPackageItemInfo(row.mPkgItem).equals(packageUserKey))
                 .findAny()
                 .orElse(null);
     }