diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index 36bdad4da4..62ce341e41 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -328,11 +328,15 @@ public interface TaskShortcutFactory { // No "save app pair" menu item if: // - app pairs feature is not enabled + // - we are in 3p launcher // - the task in question is a single task // - at least one app in app pair is unpinnable // - the Overview Actions Button should be visible - if (!FeatureFlags.enableAppPairs() || !taskView.containsMultipleTasks() - || hasUnpinnableApp || shouldShowActionsButtonInstead) { + if (!FeatureFlags.enableAppPairs() + || !recentsView.supportsAppPairs() + || !taskView.containsMultipleTasks() + || hasUnpinnableApp + || shouldShowActionsButtonInstead) { return null; } diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java index 0ee50a46b2..32d8be988c 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java @@ -302,4 +302,10 @@ public class FallbackRecentsView extends RecentsView extends FrameLayo public @interface AppPairButtonHiddenFlags { } public static final int FLAG_SINGLE_TASK_HIDE_APP_PAIR = 1 << 0; public static final int FLAG_SMALL_SCREEN_HIDE_APP_PAIR = 1 << 1; + public static final int FLAG_3P_LAUNCHER_HIDE_APP_PAIR = 1 << 2; private MultiValueAlpha mMultiValueAlpha; @@ -254,6 +255,13 @@ public class OverviewActionsView extends FrameLayo updateAppPairButtonHiddenFlags(FLAG_SMALL_SCREEN_HIDE_APP_PAIR, isSmallScreen); } + /** + * Updates flags to hide and show actions buttons for 1p/3p launchers. + */ + public void updateFor3pLauncher(boolean is3pLauncher) { + updateAppPairButtonHiddenFlags(FLAG_3P_LAUNCHER_HIDE_APP_PAIR, is3pLauncher); + } + /** * Updates the proper flags to indicate whether the "Screenshot" button should be hidden. * diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 6699147136..1a0dc3dfd6 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -4022,6 +4022,8 @@ public abstract class RecentsView