From ecb053259785827daa50d235a915b17642ffee99 Mon Sep 17 00:00:00 2001 From: Federico Baron Date: Mon, 13 Feb 2023 13:52:41 -0800 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java index 69c96ff075..44e3dd6390 100644 --- a/src/com/android/launcher3/popup/PopupDataProvider.java +++ b/src/com/android/launcher3/popup/PopupDataProvider.java @@ -242,7 +242,7 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan 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); }