Merge "Create DesktopModeDragAndDropAnimatorHelper to hold animation logic" into main (5425ed5a) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ import com.android.wm.shell.desktopmode.DesktopImeHandler;
		import com.android.wm.shell.desktopmode.DesktopImmersiveController;
		import com.android.wm.shell.desktopmode.DesktopMinimizationTransitionHandler;
		import com.android.wm.shell.desktopmode.DesktopMixedTransitionHandler;
		import com.android.wm.shell.desktopmode.DesktopModeDragAndDropAnimatorHelper;
		import com.android.wm.shell.desktopmode.DesktopModeDragAndDropTransitionHandler;
		import com.android.wm.shell.desktopmode.DesktopModeEventLogger;
		import com.android.wm.shell.desktopmode.DesktopModeKeyGestureHandler;
		@@ -1254,8 +1255,15 @@ public abstract class WMShellModule {
		@WMSingleton
		@Provides
		static DesktopModeDragAndDropTransitionHandler provideDesktopModeDragAndDropTransitionHandler(
		Transitions transitions) {
		return new DesktopModeDragAndDropTransitionHandler(transitions);
		Transitions transitions, DesktopModeDragAndDropAnimatorHelper animatorHelper) {
		return new DesktopModeDragAndDropTransitionHandler(transitions, animatorHelper);
		}

		@WMSingleton
		@Provides
		static DesktopModeDragAndDropAnimatorHelper provideDesktopModeDragAndDropAnimatorHelper(
		Context context) {
		return new DesktopModeDragAndDropAnimatorHelper(context, SurfaceControl.Transaction::new);
		}

		@WMSingleton

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

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.desktopmode

		import android.animation.Animator
		import android.animation.AnimatorListenerAdapter
		import android.animation.ValueAnimator
		import android.content.Context
		import android.view.SurfaceControl.Transaction
		import android.window.TransitionInfo.Change
		import androidx.core.util.Supplier
		import com.android.wm.shell.transition.Transitions.TransitionFinishCallback
		import javax.inject.Inject

		/**
		* Helper class for creating and managing animations related to drag and drop operations in Desktop
		* Mode. This class provides methods to create different types of animations, for example, covers
		* different animations for tab tearing.
		*/
		class DesktopModeDragAndDropAnimatorHelper
		@Inject
		constructor(val context: Context, val transactionSupplier: Supplier<Transaction>) {

		/**
		* Creates an animator for a given change, incorporating start and finish callbacks.
		*
		* This function is responsible for creating an animator that handles the visual changes defined
		* by the provided [Change] object. It leverages a transaction supplier to manage the transition
		* and provides callbacks to be executed when the animation starts and finishes.
		*
		* @param change The [Change] object describing the desired visual transition. It should contain
		* information like the view that should be animated (leash) and the start/end values.
		* @param finishCallback A [TransitionFinishCallback] that will be invoked when the animation
		* completes. It will inform the caller that the transition is finished.
		* @return An [Animator] instance configured to perform the change described by the `change`
		* parameter.
		*/
		fun createAnimator(change: Change, finishCallback: TransitionFinishCallback): Animator {
		val transaction = transactionSupplier.get()

		val animatorStartedCallback: () -> Unit = {
		transaction.show(change.leash)
		transaction.apply()
		}
		val animatorFinishedCallback: () -> Unit = { finishCallback.onTransitionFinished(null) }

		return createAlphaAnimator(change, animatorStartedCallback, animatorFinishedCallback)
		}

		private fun createAlphaAnimator(
		change: Change,
		onStart: () -> Unit,
		onFinish: () -> Unit,
		): Animator {
		val transaction = transactionSupplier.get()

		val alphaAnimator = ValueAnimator()
		alphaAnimator.setFloatValues(0f, 1f)
		alphaAnimator.setDuration(FADE_IN_ANIMATION_DURATION)

		alphaAnimator.addListener(
		object : AnimatorListenerAdapter() {
		override fun onAnimationStart(animation: Animator) {
		onStart.invoke()
		}

		override fun onAnimationEnd(animation: Animator) {
		onFinish.invoke()
		}
		}
		)
		alphaAnimator.addUpdateListener { animation: ValueAnimator ->
		transaction.setAlpha(change.leash, animation.animatedFraction)
		transaction.apply()
		}

		return alphaAnimator
		}

		companion object {
		const val FADE_IN_ANIMATION_DURATION = 300L
		}
		}

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

+12 −33

Original line number	Diff line number	Diff line
		@@ -15,11 +15,8 @@
		*/
		package com.android.wm.shell.desktopmode

		import android.animation.Animator
		import android.animation.AnimatorListenerAdapter
		import android.animation.ValueAnimator
		import android.os.IBinder
		import android.view.SurfaceControl
		import android.view.SurfaceControl.Transaction
		import android.view.WindowManager.TRANSIT_OPEN
		import android.window.TransitionInfo
		import android.window.TransitionRequestInfo
		@@ -28,8 +25,11 @@ import com.android.wm.shell.transition.Transitions
		import com.android.wm.shell.transition.Transitions.TransitionFinishCallback

		/** Transition handler for drag-and-drop (i.e., tab tear) transitions that occur in desktop mode. */
		class DesktopModeDragAndDropTransitionHandler(private val transitions: Transitions) :
		Transitions.TransitionHandler {
		class DesktopModeDragAndDropTransitionHandler(
		private val transitions: Transitions,
		private val animatorHelper: DesktopModeDragAndDropAnimatorHelper,
		) : Transitions.TransitionHandler {

		private val pendingTransitionTokens: MutableList<IBinder> = mutableListOf()

		/**
		@@ -45,8 +45,8 @@ class DesktopModeDragAndDropTransitionHandler(private val transitions: Transitio
		override fun startAnimation(
		transition: IBinder,
		info: TransitionInfo,
		startTransaction: SurfaceControl.Transaction,
		finishTransaction: SurfaceControl.Transaction,
		startTransaction: Transaction,
		finishTransaction: Transaction,
		finishCallback: TransitionFinishCallback,
		): Boolean {
		if (!pendingTransitionTokens.contains(transition)) return false
		@@ -57,26 +57,7 @@ class DesktopModeDragAndDropTransitionHandler(private val transitions: Transitio
		.hide(leash)
		.setWindowCrop(leash, endBounds.width(), endBounds.height())
		.apply()
		val animator = ValueAnimator()
		animator.setFloatValues(0f, 1f)
		animator.setDuration(FADE_IN_ANIMATION_DURATION)
		val t = SurfaceControl.Transaction()
		animator.addListener(
		object : AnimatorListenerAdapter() {
		override fun onAnimationStart(animation: Animator) {
		t.show(leash)
		t.apply()
		}

		override fun onAnimationEnd(animation: Animator) {
		finishCallback.onTransitionFinished(null)
		}
		}
		)
		animator.addUpdateListener { animation: ValueAnimator ->
		t.setAlpha(leash, animation.animatedFraction)
		t.apply()
		}
		val animator = animatorHelper.createAnimator(change, finishCallback)
		animator.start()
		pendingTransitionTokens.remove(transition)
		return true
		@@ -84,7 +65,9 @@ class DesktopModeDragAndDropTransitionHandler(private val transitions: Transitio

		private fun findRelevantChange(info: TransitionInfo): TransitionInfo.Change {
		val matchingChanges =
		info.changes.filter { c -> isValidTaskChange(c) && c.mode == TRANSIT_OPEN }
		info.changes.filter { change ->
		isValidTaskChange(change) && change.mode == TRANSIT_OPEN
		}
		if (matchingChanges.size != 1) {
		throw IllegalStateException(
		"Expected 1 relevant change but found: ${matchingChanges.size}"
		@@ -102,8 +85,4 @@ class DesktopModeDragAndDropTransitionHandler(private val transitions: Transitio
		): WindowContainerTransaction? {
		return null
		}

		companion object {
		const val FADE_IN_ANIMATION_DURATION = 300L
		}
		}

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

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.desktopmode

		import android.animation.Animator
		import android.animation.ValueAnimator
		import android.app.ActivityManager
		import android.app.WindowConfiguration
		import android.content.ComponentName
		import android.content.Context
		import android.content.Intent
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.flag.junit.SetFlagsRule
		import android.view.SurfaceControl
		import android.view.WindowManager
		import android.window.TransitionInfo
		import android.window.WindowContainerTransaction
		import androidx.core.util.Supplier
		import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
		import com.android.window.flags.Flags
		import com.android.wm.shell.desktopmode.DesktopModeDragAndDropAnimatorHelper.Companion.FADE_IN_ANIMATION_DURATION
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.verify
		import org.mockito.kotlin.whenever

		class DesktopModeDragAndDropAnimatorHelperTest {

		@get:Rule val setFlagsRule = SetFlagsRule()

		private val context = mock<Context>()
		private val transaction = mock<SurfaceControl.Transaction>()
		private val transactionSupplier = mock<Supplier<SurfaceControl.Transaction>>()

		private lateinit var helper: DesktopModeDragAndDropAnimatorHelper

		@Before
		fun setUp() {
		helper =
		DesktopModeDragAndDropAnimatorHelper(
		context = context,
		transactionSupplier = transactionSupplier,
		)
		whenever(transactionSupplier.get()).thenReturn(transaction)
		}

		@Test
		@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION)
		fun openTransition_returnsLaunchAnimator() = runOnUiThread {
		val finishCallback = mock<Function1<WindowContainerTransaction?, Unit>>()

		val alphaAnimator = helper.createAnimator(OPEN_CHANGE, finishCallback)

		assertLaunchAnimator(alphaAnimator)
		}

		@Test
		@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION)
		fun openTransition_callsAnimationEndListener() = runOnUiThread {
		val finishCallback = mock<Function1<WindowContainerTransaction?, Unit>>()

		val alphaAnimator = helper.createAnimator(OPEN_CHANGE, finishCallback)
		alphaAnimator.start()
		alphaAnimator.end()

		verify(finishCallback).invoke(null)
		}

		private fun assertLaunchAnimator(animator: Animator) {
		assertThat(animator).isInstanceOf(ValueAnimator::class.java)
		assertThat(animator.duration).isEqualTo(FADE_IN_ANIMATION_DURATION)
		assertThat((animator as ValueAnimator).values.size).isEqualTo(1)
		}

		private companion object {
		val TASK_INFO_FREEFORM =
		ActivityManager.RunningTaskInfo().apply {
		baseIntent =
		Intent().apply {
		component = ComponentName("com.example.app", "com.example.app.MainActivity")
		}
		configuration.windowConfiguration.windowingMode =
		WindowConfiguration.WINDOWING_MODE_FREEFORM
		}

		val OPEN_CHANGE =
		TransitionInfo.Change(/* container= / mock(), / leash= */ mock()).apply {
		mode = WindowManager.TRANSIT_OPEN
		taskInfo = TASK_INFO_FREEFORM
		}
		}
		}