diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 57bcc14ff3..3995f9bf2d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -384,6 +384,13 @@ public class TaskbarActivityContext extends BaseTaskbarContext { mLauncherPrefs = LauncherPrefs.get(this); } + /** + * Returns whether this is a primary display. + */ + public boolean isPrimaryDisplay() { + return mIsPrimaryDisplay; + } + /** Updates {@link DeviceProfile} instances for any Taskbar windows. */ public void updateDeviceProfile(DeviceProfile launcherDp) { applyDeviceProfile(launcherDp); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java index 6ca9385294..58606de9e1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java @@ -195,8 +195,11 @@ public class TaskbarControllers { voiceInteractionWindowController }; + // TODO(b/401061748): get primary status from + // TaskbarDesktopModeController/DesktopVisibilityController. if (taskbarDesktopModeController.isInDesktopModeAndNotInOverview( - taskbarActivityContext.getDisplayId())) { + taskbarActivityContext.getDisplayId()) + || !taskbarActivityContext.isPrimaryDisplay()) { mCornerRoundness.value = taskbarDesktopModeController.getTaskbarCornerRoundness( mSharedState.showCornerRadiusInDesktopMode); } else {