aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 01:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic742a73372f90ac630af30af51d5313ede0283f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charlie Anderson
2023-03-23 21:17:39 +00:00
committed by Automerger Merge Worker
parent 903ff4c926 bc65c3d442
commit a106266c06
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java
View File

@@ -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)
);
}

4
src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java
View File

@@ -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()) {