PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

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

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

Change-Id: I772c44c31ddecfc991d8b46252e63a4a32e75bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charlie Anderson
2023-03-23 22:23:56 +00:00
committed by Automerger Merge Worker
parent b30203904b b3325e102a
commit d02411fdf4
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java
+3 -5
View File
@@ -201,14 +201,12 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba
// Create a Stream of all applicable system shortcuts // Create a Stream of all applicable system shortcuts
private Stream<SystemShortcut.Factory> getSystemShortcuts() { private Stream<SystemShortcut.Factory> getSystemShortcuts() {
// concat a Stream of split options with a Stream of APP_INFO // append split options to APP_INFO shortcut, the order here will reflect in the popup
Stream<SystemShortcut.Factory> appInfo = Stream.of(APP_INFO);
return Stream.concat( return Stream.concat(
Stream.of(APP_INFO),
Utilities.getSplitPositionOptions(mContext.getDeviceProfile()) Utilities.getSplitPositionOptions(mContext.getDeviceProfile())
.stream() .stream()
.map(this::createSplitShortcutFactory), .map(this::createSplitShortcutFactory)
appInfo
); );
} }
src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java
+2 -2
View File
@@ -197,13 +197,13 @@ public class SecondaryDragLayer extends BaseDragLayer<SecondaryDisplayLauncher>
return false; return false;
} }
// order of this list will reflect in the popup
List<SystemShortcut> systemShortcuts = new ArrayList<>(); 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. // 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()) { if (!FeatureFlags.SECONDARY_DRAG_N_DROP_TO_PIN.get() || !mActivity.isAppDrawerShown()) {
systemShortcuts.add(mPinnedAppsAdapter.getSystemShortcut(item, v)); systemShortcuts.add(mPinnedAppsAdapter.getSystemShortcut(item, v));
} }
systemShortcuts.add(APP_INFO.getShortcut(mActivity, item, v));
int deepShortcutCount = popupDataProvider.getShortcutCountForItem(item); int deepShortcutCount = popupDataProvider.getShortcutCountForItem(item);
final PopupContainerWithArrow<SecondaryDisplayLauncher> container; final PopupContainerWithArrow<SecondaryDisplayLauncher> container;
if (ENABLE_MATERIAL_U_POPUP.get()) { if (ENABLE_MATERIAL_U_POPUP.get()) {