Merge "Show stop screen recording dialog on correct display" into main (d694630b) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt

+23 −11

Original line number	Diff line number	Diff line
		@@ -16,13 +16,17 @@

		package com.android.systemui.statusbar.chips.casttootherdevice.ui.viewmodel

		import android.content.Context
		import android.content.DialogInterface
		import android.testing.TestableLooper.RunWithLooper
		import android.view.View
		import android.view.ViewRootImpl
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.jank.Cuj
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.animation.DialogCuj
		import com.android.systemui.animation.DialogTransitionAnimator
		import com.android.systemui.animation.Expandable
		import com.android.systemui.animation.mockDialogTransitionAnimator
		import com.android.systemui.common.shared.model.ContentDescription
		@@ -59,6 +63,7 @@ import org.junit.runner.RunWith
		import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.kotlin.any
		import org.mockito.kotlin.argumentCaptor
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.eq
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.verify
		@@ -66,6 +71,7 @@ import org.mockito.kotlin.whenever

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@RunWithLooper(setAsMainLooper = true)
		class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos().also { it.testCase = this }
		private val testScope = kosmos.testScope
		@@ -75,18 +81,22 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {

		private val mockScreenCastDialog = mock<SystemUIDialog>()
		private val mockGenericCastDialog = mock<SystemUIDialog>()
		private val chipBackgroundView = mock<ChipBackgroundContainer>()
		private val chipBackgroundView =
		mock<ChipBackgroundContainer> { on { context } doReturn context }
		private val chipView =
		mock<View>().apply {
		whenever(
		this.requireViewById<ChipBackgroundContainer>(
		R.id.ongoing_activity_chip_background
		)
		)
		.thenReturn(chipBackgroundView)
		mock<View> {
		on {
		requireViewById<ChipBackgroundContainer>(R.id.ongoing_activity_chip_background)
		} doReturn chipBackgroundView
		on { context } doReturn context
		}
		private val viewRootImpl = mock<ViewRootImpl> { on { view } doReturn chipView }
		private val dialogTransitionController =
		mock<DialogTransitionAnimator.Controller> { on { viewRoot } doReturn viewRootImpl }
		private val mockExpandable: Expandable =
		mock<Expandable>().apply { whenever(dialogTransitionController(any())).thenReturn(mock()) }
		mock<Expandable> {
		on { dialogTransitionController(any()) } doReturn dialogTransitionController
		}

		private val underTest = kosmos.castToOtherDeviceChipViewModel

		@@ -96,13 +106,15 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {

		whenever(
		kosmos.mockSystemUIDialogFactory.create(
		any<EndCastScreenToOtherDeviceDialogDelegate>()
		any<EndCastScreenToOtherDeviceDialogDelegate>(),
		any<Context>(),
		)
		)
		.thenReturn(mockScreenCastDialog)
		whenever(
		kosmos.mockSystemUIDialogFactory.create(
		any<EndGenericCastToOtherDeviceDialogDelegate>()
		any<EndGenericCastToOtherDeviceDialogDelegate>(),
		any<Context>(),
		)
		)
		.thenReturn(mockGenericCastDialog)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/mediaprojection/ui/view/EndMediaProjectionDialogHelperTest.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -50,11 +50,11 @@ class EndMediaProjectionDialogHelperTest : SysuiTestCase() {
		fun createDialog_usesDelegateAndFactory() {
		val dialog = mock<SystemUIDialog>()
		val delegate = SystemUIDialog.Delegate { dialog }
		whenever(kosmos.mockSystemUIDialogFactory.create(eq(delegate))).thenReturn(dialog)
		whenever(kosmos.mockSystemUIDialogFactory.create(eq(delegate), any())).thenReturn(dialog)

		underTest.createDialog(delegate)
		underTest.createDialog(context, delegate)

		verify(kosmos.mockSystemUIDialogFactory).create(delegate)
		verify(kosmos.mockSystemUIDialogFactory).create(delegate, context)
		}

		@Test

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt

+23 −10

Original line number	Diff line number	Diff line
		@@ -16,13 +16,16 @@

		package com.android.systemui.statusbar.chips.screenrecord.ui.viewmodel

		import android.content.Context
		import android.content.DialogInterface
		import android.view.View
		import android.view.ViewRootImpl
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.jank.Cuj
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.animation.DialogCuj
		import com.android.systemui.animation.DialogTransitionAnimator
		import com.android.systemui.animation.Expandable
		import com.android.systemui.animation.mockDialogTransitionAnimator
		import com.android.systemui.common.shared.model.Icon
		@@ -56,6 +59,7 @@ import org.junit.runner.RunWith
		import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.kotlin.any
		import org.mockito.kotlin.argumentCaptor
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.eq
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.verify
		@@ -70,25 +74,34 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() {
		private val mediaProjectionRepo = kosmos.fakeMediaProjectionRepository
		private val systemClock = kosmos.fakeSystemClock
		private val mockSystemUIDialog = mock<SystemUIDialog>()
		private val chipBackgroundView = mock<ChipBackgroundContainer>()
		private val chipBackgroundView =
		mock<ChipBackgroundContainer> { on { context } doReturn context }
		private val chipView =
		mock<View>().apply {
		whenever(
		this.requireViewById<ChipBackgroundContainer>(
		R.id.ongoing_activity_chip_background
		)
		)
		.thenReturn(chipBackgroundView)
		mock<View> {
		on {
		requireViewById<ChipBackgroundContainer>(R.id.ongoing_activity_chip_background)
		} doReturn chipBackgroundView
		on { context } doReturn context
		}
		private val viewRootImpl = mock<ViewRootImpl> { on { view } doReturn chipView }
		private val dialogTransitionController =
		mock<DialogTransitionAnimator.Controller> { on { viewRoot } doReturn viewRootImpl }
		private val mockExpandable: Expandable =
		mock<Expandable>().apply { whenever(dialogTransitionController(any())).thenReturn(mock()) }
		mock<Expandable> {
		on { dialogTransitionController(any()) } doReturn dialogTransitionController
		}

		private val underTest = kosmos.screenRecordChipViewModel

		@Before
		fun setUp() {
		setUpPackageManagerForMediaProjection(kosmos)
		whenever(kosmos.mockSystemUIDialogFactory.create(any<EndScreenRecordingDialogDelegate>()))
		whenever(
		kosmos.mockSystemUIDialogFactory.create(
		any<EndScreenRecordingDialogDelegate>(),
		any<Context>(),
		)
		)
		.thenReturn(mockSystemUIDialog)
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt

+30 −12

Original line number	Diff line number	Diff line
		@@ -16,15 +16,18 @@

		package com.android.systemui.statusbar.chips.sharetoapp.ui.viewmodel

		import android.content.Context
		import android.content.DialogInterface
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.view.View
		import android.view.ViewRootImpl
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.jank.Cuj
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.animation.DialogCuj
		import com.android.systemui.animation.DialogTransitionAnimator
		import com.android.systemui.animation.Expandable
		import com.android.systemui.animation.mockDialogTransitionAnimator
		import com.android.systemui.common.shared.model.ContentDescription
		@@ -63,6 +66,7 @@ import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.Mockito.times
		import org.mockito.kotlin.any
		import org.mockito.kotlin.argumentCaptor
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.eq
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.verify
		@@ -78,18 +82,22 @@ class ShareToAppChipViewModelTest : SysuiTestCase() {

		private val mockScreenShareDialog = mock<SystemUIDialog>()
		private val mockGenericShareDialog = mock<SystemUIDialog>()
		private val chipBackgroundView = mock<ChipBackgroundContainer>()
		private val chipBackgroundView =
		mock<ChipBackgroundContainer> { on { context } doReturn context }
		private val chipView =
		mock<View>().apply {
		whenever(
		this.requireViewById<ChipBackgroundContainer>(
		R.id.ongoing_activity_chip_background
		)
		)
		.thenReturn(chipBackgroundView)
		}
		mock<View> {
		on {
		requireViewById<ChipBackgroundContainer>(R.id.ongoing_activity_chip_background)
		} doReturn chipBackgroundView
		on { context } doReturn context
		}
		private val viewRootImpl = mock<ViewRootImpl> { on { view } doReturn chipView }
		private val dialogTransitionController =
		mock<DialogTransitionAnimator.Controller> { on { viewRoot } doReturn viewRootImpl }
		private val mockExpandable: Expandable =
		mock<Expandable>().apply { whenever(dialogTransitionController(any())).thenReturn(mock()) }
		mock<Expandable> {
		on { dialogTransitionController(any()) } doReturn dialogTransitionController
		}

		private val underTest = kosmos.shareToAppChipViewModel
		private val mockDialog = mock<SystemUIDialog>()
		@@ -99,9 +107,19 @@ class ShareToAppChipViewModelTest : SysuiTestCase() {
		underTest.start()
		setUpPackageManagerForMediaProjection(kosmos)

		whenever(kosmos.mockSystemUIDialogFactory.create(any<EndShareScreenToAppDialogDelegate>()))
		whenever(
		kosmos.mockSystemUIDialogFactory.create(
		any<EndShareScreenToAppDialogDelegate>(),
		any<Context>(),
		)
		)
		.thenReturn(mockScreenShareDialog)
		whenever(kosmos.mockSystemUIDialogFactory.create(any<EndGenericShareToAppDialogDelegate>()))
		whenever(
		kosmos.mockSystemUIDialogFactory.create(
		any<EndGenericShareToAppDialogDelegate>(),
		any<Context>(),
		)
		)
		.thenReturn(mockGenericShareDialog)
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModelTest.kt

+17 −12

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.statusbar.chips.ui.viewmodel

		import android.view.View
		import android.view.ViewRootImpl
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.jank.Cuj
		@@ -39,10 +40,10 @@ import kotlin.test.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.kotlin.any
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.eq
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.verify
		import org.mockito.kotlin.whenever

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@@ -52,18 +53,22 @@ class OngoingActivityChipViewModelTest : SysuiTestCase() {
		private val dialogDelegate = SystemUIDialog.Delegate { mockSystemUIDialog }
		private val dialogTransitionAnimator = mock<DialogTransitionAnimator>()

		private val chipBackgroundView = mock<ChipBackgroundContainer>()
		private val chipBackgroundView =
		mock<ChipBackgroundContainer> { on { context } doReturn context }
		private val chipView =
		mock<View>().apply {
		whenever(
		this.requireViewById<ChipBackgroundContainer>(
		R.id.ongoing_activity_chip_background
		)
		)
		.thenReturn(chipBackgroundView)
		mock<View> {
		on {
		requireViewById<ChipBackgroundContainer>(R.id.ongoing_activity_chip_background)
		} doReturn chipBackgroundView
		on { context } doReturn context
		}
		private val viewRootImpl = mock<ViewRootImpl> { on { view } doReturn chipView }
		private val dialogTransitionController =
		mock<DialogTransitionAnimator.Controller> { on { viewRoot } doReturn viewRootImpl }
		private val mockExpandable: Expandable =
		mock<Expandable>().apply { whenever(dialogTransitionController(any())).thenReturn(mock()) }
		mock<Expandable> {
		on { dialogTransitionController(any()) } doReturn dialogTransitionController
		}

		@Test
		@DisableChipsModernization
		@@ -71,7 +76,7 @@ class OngoingActivityChipViewModelTest : SysuiTestCase() {
		val cuj = DialogCuj(Cuj.CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP, tag = "Test")
		val clickListener =
		createDialogLaunchOnClickListener(
		dialogDelegate,
		{ _ -> dialogDelegate },
		dialogTransitionAnimator,
		cuj,
		key = "key",
		@@ -92,7 +97,7 @@ class OngoingActivityChipViewModelTest : SysuiTestCase() {
		val cuj = DialogCuj(Cuj.CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP, tag = "Test")
		val clickCallback =
		createDialogLaunchOnClickCallback(
		dialogDelegate,
		{ _ -> dialogDelegate },
		dialogTransitionAnimator,
		cuj,
		key = "key",