diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:30:05 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:30:05 -0800 |
| commit | 7e8ae158f4a73ee580c468d71ca9a1df6f90a8cd (patch) | |
| tree | bd40604eb4b00a1a0e63edfe28cb0ebe33f23029 /quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java | |
| parent | ded14cc2110e39408f74abac8a83e0a0f16608d2 (diff) | |
| parent | 962f362912c24802026be9fe38aa0bb8e7dfa5c6 (diff) | |
| download | Launcher3-7e8ae158f4a73ee580c468d71ca9a1df6f90a8cd.tar.gz | |
Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: Ic9b3be62af2271286292cfaf30bda03351c1aaf6
Change-Id: I2af35abec8a5f2c046192cac6006d9cc759d93c9
Diffstat (limited to 'quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java')
| -rw-r--r-- | quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index 512b77a92a..a667dcaa6d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -15,7 +15,6 @@ */ package com.android.launcher3.taskbar; -import static com.android.launcher3.config.FeatureFlags.ENABLE_MATERIAL_U_POPUP; import static com.android.launcher3.util.SplitConfigurationOptions.getLogEventForPosition; import android.content.Intent; @@ -163,19 +162,9 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba .filter(Objects::nonNull) .collect(Collectors.toList()); - if (ENABLE_MATERIAL_U_POPUP.get()) { - container = (PopupContainerWithArrow) context.getLayoutInflater().inflate( - R.layout.popup_container_material_u, context.getDragLayer(), false); - container.populateAndShowRowsMaterialU(icon, deepShortcutCount, systemShortcuts); - } else { - container = (PopupContainerWithArrow) context.getLayoutInflater().inflate( + container = (PopupContainerWithArrow) context.getLayoutInflater().inflate( R.layout.popup_container, context.getDragLayer(), false); - container.populateAndShow( - icon, - deepShortcutCount, - mPopupDataProvider.getNotificationKeysForItem(item), - systemShortcuts); - } + container.populateAndShowRows(icon, deepShortcutCount, systemShortcuts); container.addOnAttachStateChangeListener( new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) { |