Merge "Fix bug by allowing popup notifications to be dismissed via swipe" into tm-qpr-dev am: e3b583277c am: 4da3961a11 am: 1b6dd82a2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21853403

Change-Id: Ic3e313c0fa9c219a37eee8e9c8abea66f1abca3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charlie Anderson
2023-03-08 18:19:35 +00:00
committed by Automerger Merge Worker
@@ -227,17 +227,18 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext>
if (ENABLE_MATERIAL_U_POPUP.get()) { if (ENABLE_MATERIAL_U_POPUP.get()) {
container = (PopupContainerWithArrow) launcher.getLayoutInflater().inflate( container = (PopupContainerWithArrow) launcher.getLayoutInflater().inflate(
R.layout.popup_container_material_u, launcher.getDragLayer(), false); R.layout.popup_container_material_u, launcher.getDragLayer(), false);
container.configureForLauncher(launcher);
container.populateAndShowRowsMaterialU(icon, deepShortcutCount, systemShortcuts); container.populateAndShowRowsMaterialU(icon, deepShortcutCount, systemShortcuts);
} else { } else {
container = (PopupContainerWithArrow) launcher.getLayoutInflater().inflate( container = (PopupContainerWithArrow) launcher.getLayoutInflater().inflate(
R.layout.popup_container, launcher.getDragLayer(), false); R.layout.popup_container, launcher.getDragLayer(), false);
container.configureForLauncher(launcher);
container.populateAndShow( container.populateAndShow(
icon, icon,
deepShortcutCount, deepShortcutCount,
popupDataProvider.getNotificationKeysForItem(item), popupDataProvider.getNotificationKeysForItem(item),
systemShortcuts); systemShortcuts);
} }
container.configureForLauncher(launcher);
launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item)); launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item));
container.requestFocus(); container.requestFocus();
return container; return container;