Merge "Update corner radius set for mixed transitions" into main (f9fa6e46) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,6 @@ import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD
	import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE		import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE
	import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_SNAP_RESIZE		import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_SNAP_RESIZE
	import com.android.internal.jank.InteractionJankMonitor		import com.android.internal.jank.InteractionJankMonitor
	import com.android.internal.policy.ScreenDecorationsUtils
	import com.android.internal.protolog.ProtoLog		import com.android.internal.protolog.ProtoLog
	import com.android.window.flags.Flags		import com.android.window.flags.Flags
	import com.android.wm.shell.Flags.enableFlexibleSplit		import com.android.wm.shell.Flags.enableFlexibleSplit
	@@ -1483,7 +1482,10 @@ class DesktopTasksController(
	if (!DesktopModeStatus.useRoundedCorners()) {		if (!DesktopModeStatus.useRoundedCorners()) {
	return		return
	}		}
	val cornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context)		val cornerRadius =
			context.resources
			.getDimensionPixelSize(R.dimen.desktop_windowing_freeform_rounded_corner_radius)
			.toFloat()
	info.changes		info.changes
	.filter { it.taskInfo?.windowingMode == WINDOWING_MODE_FREEFORM }		.filter { it.taskInfo?.windowingMode == WINDOWING_MODE_FREEFORM }
	.forEach { finishTransaction.setCornerRadius(it.leash, cornerRadius) }		.forEach { finishTransaction.setCornerRadius(it.leash, cornerRadius) }