From 059dcd8ef365901b3d506da8343bd0e5653cc87e Mon Sep 17 00:00:00 2001 From: Andrey Epin Date: Thu, 12 Jan 2023 19:18:44 -0800 Subject: Generalize shared elements transition logic Update shared elements transition logic in a way that allows an ImagePreviewView implementation to specify multiple transition elements. Flag: IntentResolver package entirely behind the CHOOSER_UNBUNDLED which is in teamfood Bug: 262280076 Test: manual shcreenshot animation test Test atest IntentResolverUnitTests Change-Id: Ia7cf5634bb2d907c5cdb56a22f838447a158dd25 --- .../android/intentresolver/EnterTransitionAnimationDelegateTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'java/tests/src') diff --git a/java/tests/src/com/android/intentresolver/EnterTransitionAnimationDelegateTest.kt b/java/tests/src/com/android/intentresolver/EnterTransitionAnimationDelegateTest.kt index ffe89400..9ea9dfa7 100644 --- a/java/tests/src/com/android/intentresolver/EnterTransitionAnimationDelegateTest.kt +++ b/java/tests/src/com/android/intentresolver/EnterTransitionAnimationDelegateTest.kt @@ -39,6 +39,7 @@ private const val TIMEOUT_MS = 200 @OptIn(ExperimentalCoroutinesApi::class) class EnterTransitionAnimationDelegateTest { + private val elementName = "shared-element" private val scheduler = TestCoroutineScheduler() private val dispatcher = StandardTestDispatcher(scheduler) private val lifecycleOwner = TestLifecycleOwner() @@ -89,9 +90,9 @@ class EnterTransitionAnimationDelegateTest { fun test_postponeTransition_animation_resumes_only_once() { testSubject.postponeTransition() testSubject.markOffsetCalculated() - testSubject.markImagePreviewReady(true) + testSubject.onTransitionElementReady(elementName) testSubject.markOffsetCalculated() - testSubject.markImagePreviewReady(true) + testSubject.onTransitionElementReady(elementName) scheduler.advanceTimeBy(TIMEOUT_MS + 1L) verify(activity, times(1)).startPostponedEnterTransition() @@ -105,7 +106,7 @@ class EnterTransitionAnimationDelegateTest { testSubject.markOffsetCalculated() verify(activity, never()).startPostponedEnterTransition() - testSubject.markImagePreviewReady(true) + testSubject.onAllTransitionElementsReady() verify(activity, times(1)).startPostponedEnterTransition() } } -- cgit v1.2.3-59-g8ed1b