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

Commit a106266c authored by Charlie Anderson's avatar Charlie Anderson Committed by Automerger Merge Worker
Browse files

Merge "reorder System shortcuts for taskbar and secondary display" into tm-qpr-dev am: bc65c3d4 

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



Change-Id: Ic742a73372f90ac630af30af51d5313ede0283f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 903ff4c9 bc65c3d4

quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java

+3 −5
Original line number Diff line number Diff line
@@ -201,14 +201,12 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba 


    // Create a Stream of all applicable system shortcuts

    private Stream<SystemShortcut.Factory> getSystemShortcuts() {

        // concat a Stream of split options with a Stream of APP_INFO

        Stream<SystemShortcut.Factory> 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)

        );

    }

src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java

+2 −2
Original line number Diff line number Diff line
@@ -197,13 +197,13 @@ public class SecondaryDragLayer extends BaseDragLayer<SecondaryDisplayLauncher> 
            return false;

        }



        // order of this list will reflect in the popup

        List<SystemShortcut> 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<SecondaryDisplayLauncher> container;

        if (ENABLE_MATERIAL_U_POPUP.get()) {