Merge "Add modal action for grid only overview." into tm-qpr-dev (c6c33dd1) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/TaskOverlayFactory.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -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) {