From 0772f1f7301a1c8a384da39a6759d469d7d1d3d2 Mon Sep 17 00:00:00 2001 From: Sukesh Ram Date: Tue, 4 Feb 2025 18:19:25 -0800 Subject: [PATCH] [CD Taskbar] Force 3 Button Mode on External Display by Default Force 3 Button Mode on External Display by Default. Test: m Bug: 383087890 Flag: com.android.window.flags.enable_taskbar_connected_displays Change-Id: I197be57f2abbaa533fd165d74f14a13774de5bb3 --- .../android/launcher3/taskbar/TaskbarActivityContext.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 9d1fc15693..78c8e4b95b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -45,6 +45,7 @@ import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; import static com.android.window.flags.Flags.enableStartLaunchTransitionFromTaskbarBugfix; +import static com.android.window.flags.Flags.enableTaskbarConnectedDisplays; import static com.android.wm.shell.Flags.enableTinyTaskbar; import static java.lang.invoke.MethodHandles.Lookup.PROTECTED; @@ -431,7 +432,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext { .setIsTransientTaskbar(true) .build(); } - mNavMode = DisplayController.getNavigationMode(this); + mNavMode = (enableTaskbarConnectedDisplays() && !mIsPrimaryDisplay) + ? NavigationMode.THREE_BUTTONS : DisplayController.getNavigationMode(this); + } /** Called when the visibility of the bubble bar changed. */