Merge "Add modal action for grid only overview." into tm-qpr-dev am: c6c33dd115

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

Change-Id: I9a15d97ba4d64ea4d30ee299dca3b3c7a563c823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pat Manning
2023-03-02 17:24:23 +00:00
committed by Automerger Merge Worker

View File

@@ -81,7 +81,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
boolean isTablet = activity.getDeviceProfile().isTablet;
boolean isGridOnlyOverview = isTablet && FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get();
// Add overview actions to the menu when in in-place rotate landscape mode.
// Add overview actions to the menu when in in-place rotate landscape mode, or in
// grid-only overview.
if ((!canLauncherRotate && isInLandscape) || isGridOnlyOverview) {
// Add screenshot action to task menu.
List<SystemShortcut> screenshotShortcuts = TaskShortcutFactory.SCREENSHOT
@@ -90,8 +91,9 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
shortcuts.addAll(screenshotShortcuts);
}
// Add modal action only if display orientation is the same as the device orientation.
if (orientedState.getDisplayRotation() == ROTATION_0) {
// Add modal action only if display orientation is the same as the device orientation,
// or in grid-only overview.
if (orientedState.getDisplayRotation() == ROTATION_0 || isGridOnlyOverview) {
List<SystemShortcut> modalShortcuts = TaskShortcutFactory.MODAL
.getShortcuts(activity, taskContainer);
if (modalShortcuts != null) {