Merge "App Shortcut menu bug fixes and polish." into sc-dev am: c846245f1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985072 Change-Id: Icba377c0032eee2dacec8a3c4364fa5b958880b7
This commit is contained in:
@@ -415,8 +415,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
|
||||
@Override
|
||||
public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
|
||||
return Stream.concat(super.getSupportedShortcuts(),
|
||||
Stream.of(WellbeingModel.SHORTCUT_FACTORY));
|
||||
return Stream.concat(Stream.of(WellbeingModel.SHORTCUT_FACTORY),
|
||||
super.getSupportedShortcuts());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -192,7 +192,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
|
||||
@Override
|
||||
public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
|
||||
return Stream.concat(
|
||||
super.getSupportedShortcuts(), Stream.of(mHotseatPredictionController));
|
||||
Stream.of(mHotseatPredictionController), super.getSupportedShortcuts());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user