diff options
11 files changed, 21 insertions, 169 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModel.kt index 4183cdd4369d..f5e17df71ff9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.chips.casttootherdevice.ui.viewmodel import android.content.Context import androidx.annotation.DrawableRes -import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton @@ -58,7 +57,6 @@ constructor( private val mediaProjectionChipInteractor: MediaProjectionChipInteractor, private val mediaRouterChipInteractor: MediaRouterChipInteractor, private val systemClock: SystemClock, - private val dialogTransitionAnimator: DialogTransitionAnimator, private val endMediaProjectionDialogHelper: EndMediaProjectionDialogHelper, ) : OngoingActivityChipViewModel { /** @@ -175,7 +173,6 @@ constructor( startTimeMs = systemClock.elapsedRealtime(), createDialogLaunchOnClickListener( createCastScreenToOtherDeviceDialogDelegate(state), - dialogTransitionAnimator, ), ) } @@ -191,7 +188,6 @@ constructor( colors = ColorsModel.Red, createDialogLaunchOnClickListener( createGenericCastToOtherDeviceDialogDelegate(deviceName), - dialogTransitionAnimator, ), ) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModel.kt index df25d57315ed..e201652242a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModel.kt @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.chips.screenrecord.ui.viewmodel import android.app.ActivityManager import android.content.Context import androidx.annotation.DrawableRes -import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton @@ -52,7 +51,6 @@ constructor( private val interactor: ScreenRecordChipInteractor, private val systemClock: SystemClock, private val endMediaProjectionDialogHelper: EndMediaProjectionDialogHelper, - private val dialogTransitionAnimator: DialogTransitionAnimator, ) : OngoingActivityChipViewModel { override val chip: StateFlow<OngoingActivityChipModel> = interactor.screenRecordState @@ -78,7 +76,6 @@ constructor( startTimeMs = systemClock.elapsedRealtime(), createDialogLaunchOnClickListener( createDelegate(state.recordedTask), - dialogTransitionAnimator, ), ) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModel.kt index c09772068093..45260e18e1ff 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.chips.sharetoapp.ui.viewmodel import android.content.Context import androidx.annotation.DrawableRes -import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton @@ -52,7 +51,6 @@ constructor( private val context: Context, private val mediaProjectionChipInteractor: MediaProjectionChipInteractor, private val systemClock: SystemClock, - private val dialogTransitionAnimator: DialogTransitionAnimator, private val endMediaProjectionDialogHelper: EndMediaProjectionDialogHelper, ) : OngoingActivityChipViewModel { override val chip: StateFlow<OngoingActivityChipModel> = @@ -89,10 +87,7 @@ constructor( colors = ColorsModel.Red, // TODO(b/332662551): Maybe use a MediaProjection API to fetch this time. startTimeMs = systemClock.elapsedRealtime(), - createDialogLaunchOnClickListener( - createShareToAppDialogDelegate(state), - dialogTransitionAnimator - ), + createDialogLaunchOnClickListener(createShareToAppDialogDelegate(state)), ) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModel.kt index 0dbf5d613038..65f94ac756cc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModel.kt @@ -17,10 +17,7 @@ package com.android.systemui.statusbar.chips.ui.viewmodel import android.view.View -import com.android.systemui.animation.DialogTransitionAnimator -import com.android.systemui.res.R import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel -import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer import com.android.systemui.statusbar.phone.SystemUIDialog import kotlinx.coroutines.flow.StateFlow @@ -36,19 +33,10 @@ interface OngoingActivityChipViewModel { /** Creates a chip click listener that launches a dialog created by [dialogDelegate]. */ fun createDialogLaunchOnClickListener( dialogDelegate: SystemUIDialog.Delegate, - dialogTransitionAnimator: DialogTransitionAnimator, ): View.OnClickListener { return View.OnClickListener { view -> val dialog = dialogDelegate.createDialog() - val launchableView = - view.requireViewById<ChipBackgroundContainer>( - R.id.ongoing_activity_chip_background - ) - // TODO(b/343699052): This makes a beautiful animate-in, but the - // animate-out looks odd because the dialog animates back into the chip - // but then the chip disappears. If we aren't able to address - // b/343699052 in time for launch, we should just use `dialog.show`. - dialogTransitionAnimator.showFromView(dialog, launchableView) + dialog.show() } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt index fe29140143f9..18a62cfd4355 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.chips.casttootherdevice.ui.viewmodel import android.view.View import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.mockDialogTransitionAnimator import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.coroutines.collectLastValue @@ -38,7 +37,6 @@ import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.Me import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.MediaProjectionChipInteractorTest.Companion.setUpPackageManagerForMediaProjection import com.android.systemui.statusbar.chips.ui.model.ColorsModel import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel -import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory import com.android.systemui.statusbar.policy.CastDevice @@ -47,9 +45,7 @@ import com.google.common.truth.Truth.assertThat import kotlin.test.Test import kotlinx.coroutines.test.runTest import org.junit.Before -import org.mockito.ArgumentMatchers import org.mockito.kotlin.any -import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @@ -65,17 +61,6 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { private val mockScreenCastDialog = mock<SystemUIDialog>() private val mockGenericCastDialog = mock<SystemUIDialog>() - private val chipBackgroundView = mock<ChipBackgroundContainer>() - private val chipView = - mock<View>().apply { - whenever( - this.requireViewById<ChipBackgroundContainer>( - R.id.ongoing_activity_chip_background - ) - ) - .thenReturn(chipBackgroundView) - } - private val underTest = kosmos.castToOtherDeviceChipViewModel @Before @@ -306,14 +291,8 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockScreenCastDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + clickListener!!.onClick(mock<View>()) + verify(mockScreenCastDialog).show() } @Test @@ -330,14 +309,8 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockScreenCastDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + clickListener!!.onClick(mock<View>()) + verify(mockScreenCastDialog).show() } @Test @@ -359,13 +332,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockGenericCastDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + clickListener!!.onClick(mock<View>()) + verify(mockGenericCastDialog).show() } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt index 0a06cc773727..90f94c863a4a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.chips.screenrecord.ui.viewmodel import android.view.View import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.mockDialogTransitionAnimator import com.android.systemui.common.shared.model.Icon import com.android.systemui.coroutines.collectLastValue import com.android.systemui.kosmos.Kosmos @@ -34,7 +33,6 @@ import com.android.systemui.screenrecord.data.repository.screenRecordRepository import com.android.systemui.statusbar.chips.screenrecord.ui.view.EndScreenRecordingDialogDelegate import com.android.systemui.statusbar.chips.ui.model.ColorsModel import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel -import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory import com.android.systemui.util.time.fakeSystemClock @@ -42,9 +40,7 @@ import com.google.common.truth.Truth.assertThat import kotlin.test.Test import kotlinx.coroutines.test.runTest import org.junit.Before -import org.mockito.ArgumentMatchers import org.mockito.kotlin.any -import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @@ -58,17 +54,6 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { private val systemClock = kosmos.fakeSystemClock private val mockSystemUIDialog = mock<SystemUIDialog>() - private val chipBackgroundView = mock<ChipBackgroundContainer>() - private val chipView = - mock<View>().apply { - whenever( - this.requireViewById<ChipBackgroundContainer>( - R.id.ongoing_activity_chip_background - ) - ) - .thenReturn(chipBackgroundView) - } - private val underTest = kosmos.screenRecordChipViewModel @Before @@ -197,15 +182,9 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) + clickListener!!.onClick(mock<View>()) // EndScreenRecordingDialogDelegate will test that the dialog has the right message - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockSystemUIDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + verify(mockSystemUIDialog).show() } @Test @@ -219,15 +198,9 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) + clickListener!!.onClick(mock<View>()) // EndScreenRecordingDialogDelegate will test that the dialog has the right message - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockSystemUIDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + verify(mockSystemUIDialog).show() } @Test @@ -244,14 +217,8 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) + clickListener!!.onClick(mock<View>()) // EndScreenRecordingDialogDelegate will test that the dialog has the right message - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockSystemUIDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + verify(mockSystemUIDialog).show() } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt index 3028d008f01d..29fd792821d4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.chips.sharetoapp.ui.viewmodel import android.view.View import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.mockDialogTransitionAnimator import com.android.systemui.common.shared.model.Icon import com.android.systemui.coroutines.collectLastValue import com.android.systemui.kosmos.Kosmos @@ -35,7 +34,6 @@ import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.Me import com.android.systemui.statusbar.chips.sharetoapp.ui.view.EndShareToAppDialogDelegate import com.android.systemui.statusbar.chips.ui.model.ColorsModel import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel -import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory import com.android.systemui.util.time.fakeSystemClock @@ -43,9 +41,7 @@ import com.google.common.truth.Truth.assertThat import kotlin.test.Test import kotlinx.coroutines.test.runTest import org.junit.Before -import org.mockito.ArgumentMatchers import org.mockito.kotlin.any -import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @@ -59,17 +55,6 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { private val mockShareDialog = mock<SystemUIDialog>() - private val chipBackgroundView = mock<ChipBackgroundContainer>() - private val chipView = - mock<View>().apply { - whenever( - this.requireViewById<ChipBackgroundContainer>( - R.id.ongoing_activity_chip_background - ) - ) - .thenReturn(chipBackgroundView) - } - private val underTest = kosmos.shareToAppChipViewModel @Before @@ -193,14 +178,8 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockShareDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + clickListener!!.onClick(mock<View>()) + verify(mockShareDialog).show() } @Test @@ -216,13 +195,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListener) assertThat(clickListener).isNotNull() - clickListener!!.onClick(chipView) - verify(kosmos.mockDialogTransitionAnimator) - .showFromView( - eq(mockShareDialog), - eq(chipBackgroundView), - eq(null), - ArgumentMatchers.anyBoolean(), - ) + clickListener!!.onClick(mock<View>()) + verify(mockShareDialog).show() } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModelTest.kt index c9c7359a89eb..2e0c7735c837 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModelTest.kt @@ -19,50 +19,25 @@ package com.android.systemui.statusbar.chips.ui.viewmodel import android.view.View import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogTransitionAnimator -import com.android.systemui.res.R -import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener import com.android.systemui.statusbar.phone.SystemUIDialog import kotlin.test.Test -import org.mockito.ArgumentMatchers.anyBoolean -import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.verify -import org.mockito.kotlin.whenever @SmallTest class OngoingActivityChipViewModelTest : SysuiTestCase() { private val mockSystemUIDialog = mock<SystemUIDialog>() private val dialogDelegate = SystemUIDialog.Delegate { mockSystemUIDialog } - private val dialogTransitionAnimator = mock<DialogTransitionAnimator>() - - private val chipBackgroundView = mock<ChipBackgroundContainer>() - private val chipView = - mock<View>().apply { - whenever( - this.requireViewById<ChipBackgroundContainer>( - R.id.ongoing_activity_chip_background - ) - ) - .thenReturn(chipBackgroundView) - } @Test fun createDialogLaunchOnClickListener_showsDialogOnClick() { - val clickListener = - createDialogLaunchOnClickListener(dialogDelegate, dialogTransitionAnimator) + val clickListener = createDialogLaunchOnClickListener(dialogDelegate) // Dialogs must be created on the main thread context.mainExecutor.execute { - clickListener.onClick(chipView) - verify(dialogTransitionAnimator) - .showFromView( - eq(mockSystemUIDialog), - eq(chipBackgroundView), - eq(null), - anyBoolean(), - ) + clickListener.onClick(mock<View>()) + verify(mockSystemUIDialog).show() } } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelKosmos.kt index 144fe26ea230..2335f21b2094 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelKosmos.kt @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.chips.casttootherdevice.ui.viewmodel import android.content.applicationContext -import com.android.systemui.animation.mockDialogTransitionAnimator import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.statusbar.chips.casttootherdevice.domain.interactor.mediaRouterChipInteractor @@ -34,6 +33,5 @@ val Kosmos.castToOtherDeviceChipViewModel: CastToOtherDeviceChipViewModel by mediaRouterChipInteractor = mediaRouterChipInteractor, systemClock = fakeSystemClock, endMediaProjectionDialogHelper = endMediaProjectionDialogHelper, - dialogTransitionAnimator = mockDialogTransitionAnimator, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelKosmos.kt index 1d06947a40da..2773f825f368 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelKosmos.kt @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.chips.screenrecord.ui.viewmodel import android.content.applicationContext -import com.android.systemui.animation.mockDialogTransitionAnimator import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.statusbar.chips.mediaprojection.ui.view.endMediaProjectionDialogHelper @@ -31,7 +30,6 @@ val Kosmos.screenRecordChipViewModel: ScreenRecordChipViewModel by context = applicationContext, interactor = screenRecordChipInteractor, endMediaProjectionDialogHelper = endMediaProjectionDialogHelper, - dialogTransitionAnimator = mockDialogTransitionAnimator, systemClock = fakeSystemClock, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelKosmos.kt index 2e475a3c6885..1b3108cdb5df 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelKosmos.kt @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.chips.sharetoapp.ui.viewmodel import android.content.applicationContext -import com.android.systemui.animation.mockDialogTransitionAnimator import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.mediaProjectionChipInteractor @@ -32,6 +31,5 @@ val Kosmos.shareToAppChipViewModel: ShareToAppChipViewModel by mediaProjectionChipInteractor = mediaProjectionChipInteractor, systemClock = fakeSystemClock, endMediaProjectionDialogHelper = endMediaProjectionDialogHelper, - dialogTransitionAnimator = mockDialogTransitionAnimator, ) } |