diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java index 7f880907c3..5a4c769af2 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java @@ -323,7 +323,7 @@ public class FallbackRecentsView, orientedState: RecentsOrientedState, - taskOverlayFactory: TaskOverlayFactory + taskOverlayFactory: TaskOverlayFactory, ) { if (DEBUG) { val sb = StringBuilder() @@ -126,7 +126,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu snapshotView, // Add snapshotView to the front after initial views e.g. icon and // background. - childCountAtInflation + childCountAtInflation, ) TaskContainer( this, @@ -137,7 +137,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu SplitConfigurationOptions.STAGE_POSITION_UNDEFINED, digitalWellBeingToast = null, showWindowsView = null, - taskOverlayFactory + taskOverlayFactory, ) } taskContainers.forEach { it.bind() } @@ -159,12 +159,12 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu override fun updateTaskSize( lastComputedTaskSize: Rect, lastComputedGridTaskSize: Rect, - lastComputedCarouselTaskSize: Rect + lastComputedCarouselTaskSize: Rect, ) { super.updateTaskSize( lastComputedTaskSize, lastComputedGridTaskSize, - lastComputedCarouselTaskSize + lastComputedCarouselTaskSize, ) if (taskContainers.isEmpty()) { return @@ -186,7 +186,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu Log.d( TAG, "onMeasure: container=[$containerWidth,$containerHeight]" + - "window=[$windowWidth,$windowHeight] scale=[$scaleWidth,$scaleHeight]" + "window=[$windowWidth,$windowHeight] scale=[$scaleWidth,$scaleHeight]", ) } @@ -218,7 +218,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu Log.d( TAG, "onMeasure: task=${it.task.key} size=[$width,$height]" + - " margin=[$leftMargin,$topMargin]" + " margin=[$leftMargin,$topMargin]", ) } } @@ -252,7 +252,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "launchDesktopFromRecents", - taskIds.contentToString() + taskIds.contentToString(), ) val endCallback = RunnableList() val desktopController = recentsView.desktopRecentsController @@ -262,7 +262,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu } Log.d( TAG, - "launchTaskWithDesktopController: ${taskIds.contentToString()}, withRemoteTransition: $animated" + "launchTaskWithDesktopController: ${taskIds.contentToString()}, withRemoteTransition: $animated", ) // Callbacks get run from recentsView for case when recents animation already running @@ -274,11 +274,13 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu override fun launchWithoutAnimation( isQuickSwitch: Boolean, - callback: (launched: Boolean) -> Unit + callback: (launched: Boolean) -> Unit, ) = launchTaskWithDesktopController(animated = false)?.add { callback(true) } ?: callback(false) - // Desktop tile can't be in split screen - override fun confirmSecondSplitSelectApp(): Boolean = false + // Return true when Task cannot be launched as fullscreen (i.e. in split select state) to skip + // putting DesktopTaskView to split as it's not supported. + override fun confirmSecondSplitSelectApp(): Boolean = + recentsView?.canLaunchFullscreenTask() != true // TODO(b/330685808) support overlay for Screenshot action override fun setOverlayEnabled(overlayEnabled: Boolean) {} diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index 8f20cd3857..00e57c2971 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java @@ -250,7 +250,7 @@ public class LauncherRecentsView extends RecentsView