Merge "Show launcher icons behind dragged task" into main (e7df3624) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -954,14 +954,15 @@ public abstract class WMShellModule {
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
		@DynamicOverride DesktopUserRepositories desktopUserRepositories,
		InteractionJankMonitor interactionJankMonitor,
		Optional<BubbleController> bubbleController) {
		Optional<BubbleController> bubbleController,
		DisplayController displayController) {
		return ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX.isTrue()
		? new SpringDragToDesktopTransitionHandler(
		context, transitions, rootTaskDisplayAreaOrganizer, desktopUserRepositories,
		interactionJankMonitor, bubbleController)
		interactionJankMonitor, bubbleController, displayController)
		: new DefaultDragToDesktopTransitionHandler(
		context, transitions, rootTaskDisplayAreaOrganizer, desktopUserRepositories,
		interactionJankMonitor, bubbleController);
		interactionJankMonitor, bubbleController, displayController);
		}

		@WMSingleton

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

+44 −7

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import com.android.wm.shell.RootTaskDisplayAreaOrganizer
		import com.android.wm.shell.animation.FloatProperties
		import com.android.wm.shell.bubbles.BubbleController
		import com.android.wm.shell.bubbles.BubbleTransitions
		import com.android.wm.shell.common.DisplayController
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP
		@@ -52,6 +53,8 @@ import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE
		import com.android.wm.shell.shared.TransitionUtil
		import com.android.wm.shell.shared.animation.Interpolators
		import com.android.wm.shell.shared.animation.PhysicsAnimator
		import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper
		import com.android.wm.shell.shared.desktopmode.DesktopModeStatus
		import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT
		import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT
		import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED
		@@ -84,6 +87,7 @@ sealed class DragToDesktopTransitionHandler(
		private val desktopUserRepositories: DesktopUserRepositories,
		protected val interactionJankMonitor: InteractionJankMonitor,
		private val bubbleController: Optional<BubbleController>,
		private val displayController: DisplayController,
		protected val transactionSupplier: Supplier<SurfaceControl.Transaction>,
		) : TransitionHandler {

		@@ -406,7 +410,7 @@ sealed class DragToDesktopTransitionHandler(
		return false
		}

		val layers = calculateStartDragToDesktopLayers(info)
		val layers = calculateStartDragLayers(info)
		val leafTaskFilter = TransitionUtil.LeafTaskFilter()
		info.changes.withIndex().forEach { (i, change) ->
		if (TransitionUtil.isWallpaper(change)) {
		@@ -634,14 +638,43 @@ sealed class DragToDesktopTransitionHandler(
		}

		/**
		* Calculates start drag to desktop layers for transition [info]. The leash layer is calculated
		* based on its change position in the transition, e.g. `appLayer = appLayers - i`, where i is
		* the change index.
		* Calculates start drag layers for transition [info]. The leash layer is calculated based on
		* its change position in the transition, e.g. `appLayer = appLayers - i`, where i is the change
		* index.
		*/
		protected abstract fun calculateStartDragToDesktopLayers(
		protected fun calculateStartDragLayers(info: TransitionInfo): DragToDesktopLayers {
		if (BubbleAnythingFlagHelper.enableBubbleToFullscreen()) {
		val display = displayController.getDisplay(info.getRoot(0).displayId)
		if (display != null) {
		val hasDesktop = DesktopModeStatus.isDesktopModeSupportedOnDisplay(context, display)
		if (!hasDesktop) {
		return calculateStartDragLayersWithoutDesktop(info)
		}
		}
		}
		return calculateStartDragLayersWithDesktop(info)
		}

		protected abstract fun calculateStartDragLayersWithDesktop(
		info: TransitionInfo
		): DragToDesktopLayers

		/**
		* @return layers in order:
		* - appLayers - below everything z < 0, effectively hides the leash
		* - wallpaperLayers - wallpaper on top of apps, z in 0..<size
		* - homeLayers - home task on top of wallpaper, z in size..<size*2
		* - dragLayer - the dragged task on top of everything, z == size*2
		*/
		private fun calculateStartDragLayersWithoutDesktop(info: TransitionInfo): DragToDesktopLayers {
		return DragToDesktopLayers(
		topAppLayer = -1,
		topWallpaperLayer = info.changes.size - 1,
		topHomeLayer = info.changes.size * 2 - 1,
		dragLayer = info.changes.size * 2,
		)
		}

		override fun mergeAnimation(
		transition: IBinder,
		info: TransitionInfo,
		@@ -1211,6 +1244,7 @@ constructor(
		desktopUserRepositories: DesktopUserRepositories,
		interactionJankMonitor: InteractionJankMonitor,
		bubbleController: Optional<BubbleController>,
		displayController: DisplayController,
		transactionSupplier: Supplier<SurfaceControl.Transaction> = Supplier {
		SurfaceControl.Transaction()
		},
		@@ -1222,6 +1256,7 @@ constructor(
		desktopUserRepositories,
		interactionJankMonitor,
		bubbleController,
		displayController,
		transactionSupplier,
		) {

		@@ -1232,7 +1267,7 @@ constructor(
		* - wallpaperLayers - wallpaper on top of home
		* - dragLayer - the dragged task on top of everything, there's only 1 dragged task
		*/
		override fun calculateStartDragToDesktopLayers(info: TransitionInfo): DragToDesktopLayers =
		override fun calculateStartDragLayersWithDesktop(info: TransitionInfo): DragToDesktopLayers =
		DragToDesktopLayers(
		topAppLayer = info.changes.size,
		topHomeLayer = info.changes.size * 2,
		@@ -1251,6 +1286,7 @@ constructor(
		desktopUserRepositories: DesktopUserRepositories,
		interactionJankMonitor: InteractionJankMonitor,
		bubbleController: Optional<BubbleController>,
		displayController: DisplayController,
		transactionSupplier: Supplier<SurfaceControl.Transaction> = Supplier {
		SurfaceControl.Transaction()
		},
		@@ -1262,6 +1298,7 @@ constructor(
		desktopUserRepositories,
		interactionJankMonitor,
		bubbleController,
		displayController,
		transactionSupplier,
		) {

		@@ -1278,7 +1315,7 @@ constructor(
		* - wallpaperLayers - wallpaper on top of home, z in size..<size*2
		* - dragLayer - the dragged task on top of everything, z == size*2
		*/
		override fun calculateStartDragToDesktopLayers(info: TransitionInfo): DragToDesktopLayers =
		override fun calculateStartDragLayersWithDesktop(info: TransitionInfo): DragToDesktopLayers =
		DragToDesktopLayers(
		topAppLayer = -1,
		topHomeLayer = info.changes.size - 1,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt

+120 −13

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper.RunWithLooper
		import android.view.Display
		import android.view.SurfaceControl
		import android.view.WindowManager.TRANSIT_OPEN
		import android.window.TransitionInfo
		@@ -32,11 +33,13 @@ import com.android.wm.shell.ShellTestCase
		import com.android.wm.shell.TestRunningTaskInfoBuilder
		import com.android.wm.shell.bubbles.BubbleController
		import com.android.wm.shell.bubbles.BubbleTransitions
		import com.android.wm.shell.common.DisplayController
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP
		import com.android.wm.shell.desktopmode.DragToDesktopTransitionHandler.CancelState
		import com.android.wm.shell.desktopmode.DragToDesktopTransitionHandler.Companion.DRAG_TO_DESKTOP_FINISH_ANIM_DURATION_MS
		import com.android.wm.shell.shared.desktopmode.DesktopModeStatus
		import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT
		import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT
		import com.android.wm.shell.splitscreen.SplitScreenController
		@@ -48,7 +51,8 @@ import java.util.function.Supplier
		import junit.framework.Assert.assertEquals
		import junit.framework.Assert.assertFalse
		import junit.framework.Assert.assertTrue
		import org.junit.After
		import org.junit.Assume.assumeFalse
		import org.junit.Assume.assumeTrue
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		@@ -59,9 +63,9 @@ import org.mockito.ArgumentMatchers.anyInt
		import org.mockito.ArgumentMatchers.anyLong
		import org.mockito.ArgumentMatchers.eq
		import org.mockito.Mock
		import org.mockito.MockitoSession
		import org.mockito.kotlin.anyOrNull
		import org.mockito.kotlin.argThat
		import org.mockito.kotlin.argumentCaptor
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.never
		import org.mockito.kotlin.times
		@@ -84,10 +88,13 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		@Mock private lateinit var mockInteractionJankMonitor: InteractionJankMonitor
		@Mock private lateinit var draggedTaskLeash: SurfaceControl
		@Mock private lateinit var homeTaskLeash: SurfaceControl
		@Mock private lateinit var wallpaperLeash: SurfaceControl
		@Mock private lateinit var desktopUserRepositories: DesktopUserRepositories
		@Mock private lateinit var bubbleController: BubbleController
		@Mock private lateinit var visualIndicator: DesktopModeVisualIndicator
		@Mock private lateinit var dragCancelCallback: Runnable
		@Mock private lateinit var displayController: DisplayController
		@Mock private lateinit var internalDisplay: Display
		@Mock
		private lateinit var dragToDesktopStateListener:
		DragToDesktopTransitionHandler.DragToDesktopStateListener
		@@ -101,7 +108,6 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {

		private lateinit var defaultHandler: DragToDesktopTransitionHandler
		private lateinit var springHandler: SpringDragToDesktopTransitionHandler
		private lateinit var mockitoSession: MockitoSession

		@Before
		fun setUp() {
		@@ -113,6 +119,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		desktopUserRepositories,
		mockInteractionJankMonitor,
		Optional.of(bubbleController),
		displayController,
		transactionSupplier,
		)
		.apply {
		@@ -128,6 +135,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		desktopUserRepositories,
		mockInteractionJankMonitor,
		Optional.of(bubbleController),
		displayController,
		transactionSupplier,
		)
		.apply {
		@@ -135,11 +143,6 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		dragToDesktopStateListener =
		this@DragToDesktopTransitionHandlerTest.dragToDesktopStateListener
		}
		mockitoSession =
		ExtendedMockito.mockitoSession()
		.strictness(Strictness.LENIENT)
		.mockStatic(SystemProperties::class.java)
		.startMocking()
		whenever(
		transitions.startTransition(
		eq(TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP),
		@@ -148,11 +151,15 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		)
		)
		.thenReturn(mock<IBinder>())
		}

		@After
		fun tearDown() {
		mockitoSession.finishMocking()
		whenever(internalDisplay.type).thenReturn(Display.TYPE_INTERNAL)
		whenever(internalDisplay.displayId).thenReturn(Display.DEFAULT_DISPLAY)
		whenever(displayController.getDisplay(anyInt())).thenReturn(internalDisplay)

		mContext.orCreateTestableResources.addOverride(
		com.android.internal.R.bool.config_canInternalDisplayHostDesktops,
		true,
		)
		}

		@Test
		@@ -623,6 +630,12 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {

		@Test
		fun propertyValue_returnsSystemPropertyValue() {
		val mockitoSession =
		ExtendedMockito.mockitoSession()
		.strictness(Strictness.LENIENT)
		.mockStatic(SystemProperties::class.java)
		.startMocking()

		val name = "property_name"
		val value = 10f

		@@ -634,10 +647,18 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		/* expected= */ value,
		/* actual= */ SpringDragToDesktopTransitionHandler.propertyValue(name),
		)

		mockitoSession.finishMocking()
		}

		@Test
		fun propertyValue_withScale_returnsScaledSystemPropertyValue() {
		val mockitoSession =
		ExtendedMockito.mockitoSession()
		.strictness(Strictness.LENIENT)
		.mockStatic(SystemProperties::class.java)
		.startMocking()

		val name = "property_name"
		val value = 10f
		val scale = 100f
		@@ -650,10 +671,18 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		/* expected= */ value / scale,
		/* actual= */ SpringDragToDesktopTransitionHandler.propertyValue(name, scale = scale),
		)

		mockitoSession.finishMocking()
		}

		@Test
		fun propertyValue_notSet_returnsDefaultValue() {
		val mockitoSession =
		ExtendedMockito.mockitoSession()
		.strictness(Strictness.LENIENT)
		.mockStatic(SystemProperties::class.java)
		.startMocking()

		val name = "property_name"
		val defaultValue = 50f

		@@ -668,10 +697,18 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		default = defaultValue,
		),
		)

		mockitoSession.finishMocking()
		}

		@Test
		fun propertyValue_withScaleNotSet_returnsDefaultValue() {
		val mockitoSession =
		ExtendedMockito.mockitoSession()
		.strictness(Strictness.LENIENT)
		.mockStatic(SystemProperties::class.java)
		.startMocking()

		val name = "property_name"
		val defaultValue = 0.5f
		val scale = 100f
		@@ -690,6 +727,8 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		scale = scale,
		),
		)

		mockitoSession.finishMocking()
		}

		@Test
		@@ -981,6 +1020,74 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		verify(visualIndicator, never()).fadeInIndicator()
		}

		@Test
		fun startDrag_hasDesktop_layerOrder_taskOnWallpaperOnHome() {
		assumeTrue(DesktopModeStatus.isDesktopModeSupportedOnDisplay(context, internalDisplay))
		val task = createTask()
		val rootLeash = mock<SurfaceControl>()
		val startTransaction = mock<SurfaceControl.Transaction>()
		startDrag(
		defaultHandler,
		task,
		startTransaction = startTransaction,
		transitionRootLeash = rootLeash,
		)

		val draggedTaskLayer =
		argumentCaptor<Int> {
		verify(startTransaction).setLayer(eq(draggedTaskLeash), capture())
		}
		.firstValue
		val wallpaperLayer =
		argumentCaptor<Int> { verify(startTransaction).setLayer(eq(wallpaperLeash), capture()) }
		.firstValue
		val homeLayer =
		argumentCaptor<Int> { verify(startTransaction).setLayer(eq(homeTaskLeash), capture()) }
		.firstValue

		// dragged task -> wallpaper -> home
		assertThat(draggedTaskLayer).isGreaterThan(wallpaperLayer)
		assertThat(wallpaperLayer).isGreaterThan(homeLayer)
		}

		@Test
		@EnableFlags(
		com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_TO_FULLSCREEN,
		com.android.wm.shell.Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE,
		)
		fun startDrag_noDesktop_layerOrder_taskOnHomeOnWallpaper() {
		mContext.orCreateTestableResources.addOverride(
		com.android.internal.R.bool.config_canInternalDisplayHostDesktops,
		false,
		)
		assumeFalse(DesktopModeStatus.isDesktopModeSupportedOnDisplay(context, internalDisplay))
		val task = createTask()
		val rootLeash = mock<SurfaceControl>()
		val startTransaction = mock<SurfaceControl.Transaction>()
		startDrag(
		defaultHandler,
		task,
		startTransaction = startTransaction,
		transitionRootLeash = rootLeash,
		)

		val draggedTaskLayer =
		argumentCaptor<Int> {
		verify(startTransaction).setLayer(eq(draggedTaskLeash), capture())
		}
		.firstValue
		val homeLayer =
		argumentCaptor<Int> { verify(startTransaction).setLayer(eq(homeTaskLeash), capture()) }
		.firstValue
		val wallpaperLayer =
		argumentCaptor<Int> { verify(startTransaction).setLayer(eq(wallpaperLeash), capture()) }
		.firstValue

		// dragged task -> home -> wallpaper
		assertThat(draggedTaskLayer).isGreaterThan(homeLayer)
		assertThat(homeLayer).isGreaterThan(wallpaperLayer)
		}

		private fun startDrag(
		handler: DragToDesktopTransitionHandler,
		task: RunningTaskInfo = createTask(),
		@@ -1106,7 +1213,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() {
		}
		)
		addChange( // Wallpaper.
		TransitionInfo.Change(mock(), mock()).apply {
		TransitionInfo.Change(mock(), wallpaperLeash).apply {
		parent = null
		taskInfo = null
		flags = flags or FLAG_IS_WALLPAPER