Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3b58327 authored by Charlie Anderson's avatar Charlie Anderson Committed by Android (Google) Code Review
Browse files

Merge "Fix bug by allowing popup notifications to be dismissed via swipe" into tm-qpr-dev

parents 3b072b9a 5023c2f6

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

+2 −1
Original line number Diff line number Diff line
@@ -227,17 +227,18 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 
        if (ENABLE_MATERIAL_U_POPUP.get()) {

            container = (PopupContainerWithArrow) launcher.getLayoutInflater().inflate(

                    R.layout.popup_container_material_u, launcher.getDragLayer(), false);

            container.configureForLauncher(launcher);

            container.populateAndShowRowsMaterialU(icon, deepShortcutCount, systemShortcuts);

        } else {

            container = (PopupContainerWithArrow) launcher.getLayoutInflater().inflate(

                    R.layout.popup_container, launcher.getDragLayer(), false);

            container.configureForLauncher(launcher);

            container.populateAndShow(

                    icon,

                    deepShortcutCount,

                    popupDataProvider.getNotificationKeysForItem(item),

                    systemShortcuts);

        }

        container.configureForLauncher(launcher);

        launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item));

        container.requestFocus();

        return container;