From 04c6def895c737d0e2f964749a14f6f87c34d1b9 Mon Sep 17 00:00:00 2001 From: Charlie Anderson Date: Thu, 23 Mar 2023 11:23:55 -0400 Subject: [PATCH] reorder System shortcuts for taskbar and secondary display Bug: 269343928 Bug: 272418357 Test: locally on device Change-Id: Iec7f9ad702214c7ab7f49758dbf2463fe63b0324 --- .../android/launcher3/taskbar/TaskbarPopupController.java | 8 +++----- .../launcher3/secondarydisplay/SecondaryDragLayer.java | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index 0ed453818e..cfc7813305 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -201,14 +201,12 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba // Create a Stream of all applicable system shortcuts private Stream getSystemShortcuts() { - // concat a Stream of split options with a Stream of APP_INFO - Stream appInfo = Stream.of(APP_INFO); - + // append split options to APP_INFO shortcut, the order here will reflect in the popup return Stream.concat( + Stream.of(APP_INFO), Utilities.getSplitPositionOptions(mContext.getDeviceProfile()) .stream() - .map(this::createSplitShortcutFactory), - appInfo + .map(this::createSplitShortcutFactory) ); } diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java index 2ffe34f415..a917b68e56 100644 --- a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java +++ b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java @@ -197,13 +197,13 @@ public class SecondaryDragLayer extends BaseDragLayer return false; } + // order of this list will reflect in the popup List systemShortcuts = new ArrayList<>(); - + systemShortcuts.add(APP_INFO.getShortcut(mActivity, item, v)); // Hide redundant pin shortcut for app drawer icons if drag-n-drop is enabled. if (!FeatureFlags.SECONDARY_DRAG_N_DROP_TO_PIN.get() || !mActivity.isAppDrawerShown()) { systemShortcuts.add(mPinnedAppsAdapter.getSystemShortcut(item, v)); } - systemShortcuts.add(APP_INFO.getShortcut(mActivity, item, v)); int deepShortcutCount = popupDataProvider.getShortcutCountForItem(item); final PopupContainerWithArrow container; if (ENABLE_MATERIAL_U_POPUP.get()) {