Merge "Update sysui state flags through SysUI dialog manager" into main (e63e0b7a) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.animation.DialogTransitionAnimator
		import com.android.systemui.common.domain.interactor.SysUIStateDisplaysInteractor
		import com.android.systemui.common.ui.view.SeekBarWithIconButtonsView
		import com.android.systemui.res.R
		import com.android.systemui.settings.UserTracker
		@@ -74,7 +73,6 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
		@Mock private lateinit var dialogManager: SystemUIDialogManager
		@Mock private lateinit var dialogFactory: SystemUIDialog.Factory
		@Mock private lateinit var userTracker: UserTracker
		@Mock private lateinit var sysUIStateInteractor: SysUIStateDisplaysInteractor
		@Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator

		@Before
		@@ -112,7 +110,6 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
		0,
		DEFAULT_DISMISS_ON_DEVICE_LOCK,
		dialogManager,
		sysUIStateInteractor,
		fakeBroadcastDispatcher,
		mDialogTransitionAnimator,
		fontScalingDialogDelegate,

+0 −4

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ import com.android.systemui.SysuiTestCase;
		import com.android.systemui.animation.DialogTransitionAnimator;
		import com.android.systemui.bluetooth.qsdialog.DeviceItem;
		import com.android.systemui.bluetooth.qsdialog.DeviceItemType;
		import com.android.systemui.common.domain.interactor.SysUIStateDisplaysInteractor;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.qs.shared.QSSettingsPackageRepository;
		import com.android.systemui.res.R;
		@@ -119,8 +118,6 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase {
		@Mock
		private SystemUIDialogManager mSystemUIDialogManager;
		@Mock
		private SysUIStateDisplaysInteractor mSysUiStateInteractor;
		@Mock
		private DialogTransitionAnimator mDialogTransitionAnimator;
		@Mock
		private ActivityStarter mActivityStarter;
		@@ -390,7 +387,6 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase {
		mDialogFactory = new SystemUIDialog.Factory(
		mContext,
		mSystemUIDialogManager,
		mSysUiStateInteractor,
		getFakeBroadcastDispatcher(),
		mDialogTransitionAnimator
		);

+3 −7

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import com.android.systemui.kosmos.testScope
		import com.android.systemui.shade.domain.interactor.shadeInteractor
		import com.android.systemui.shade.shadeTestUtil
		import com.android.systemui.statusbar.phone.SystemUIDialogManager
		import com.android.systemui.statusbar.phone.systemUIDialogManager
		import com.android.systemui.statusbar.phone.mockSystemUIDialogManager
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.test.runCurrent
		@@ -57,7 +57,7 @@ class DefaultUdfpsTouchOverlayViewModelTest(flags: FlagsParameterization) : Sysu

		@Captor
		private lateinit var sysuiDialogListenerCaptor: ArgumentCaptor<SystemUIDialogManager.Listener>
		private var systemUIDialogManager = kosmos.systemUIDialogManager
		private var systemUIDialogManager = kosmos.mockSystemUIDialogManager
		private val keyguardRepository = kosmos.fakeKeyguardRepository

		private val shadeTestUtil by lazy { kosmos.shadeTestUtil }
		@@ -79,11 +79,7 @@ class DefaultUdfpsTouchOverlayViewModelTest(flags: FlagsParameterization) : Sysu
		@Before
		fun setUp() {
		MockitoAnnotations.initMocks(this)
		underTest =
		DefaultUdfpsTouchOverlayViewModel(
		kosmos.shadeInteractor,
		systemUIDialogManager,
		)
		underTest = DefaultUdfpsTouchOverlayViewModel(kosmos.shadeInteractor, systemUIDialogManager)
		}

		private fun shadeExpanded(expanded: Boolean) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.ui.viewmodel.fakeDeviceEntryIconViewModelTransition
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.statusbar.phone.SystemUIDialogManager
		import com.android.systemui.statusbar.phone.systemUIDialogManager
		import com.android.systemui.statusbar.phone.mockSystemUIDialogManager
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.test.runCurrent
		@@ -48,7 +48,7 @@ class DeviceEntryUdfpsTouchOverlayViewModelTest : SysuiTestCase() {
		testKosmos().apply {
		fakeFeatureFlagsClassic.apply { set(Flags.FULL_SCREEN_USER_SWITCHER, true) }
		}
		private val systemUIDialogManager = kosmos.systemUIDialogManager
		private val systemUIDialogManager = kosmos.mockSystemUIDialogManager
		private val bouncerRepository = kosmos.fakeKeyguardBouncerRepository
		private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository
		private val testScope = kosmos.testScope

+0 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.animation.DialogTransitionAnimator
		import com.android.systemui.broadcast.BroadcastDispatcher
		import com.android.systemui.common.domain.interactor.SysUIStateDisplaysInteractor
		import com.android.systemui.flags.FeatureFlagsClassic
		import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger
		import com.android.systemui.mediaprojection.SessionCreationSource
		@@ -71,7 +70,6 @@ class RecordIssueDialogDelegateTest : SysuiTestCase() {
		private lateinit var screenCaptureDisabledDialogDelegate: ScreenCaptureDisabledDialogDelegate
		@Mock private lateinit var screenCaptureDisabledDialog: SystemUIDialog

		@Mock private lateinit var sysUIStateDisplaysInteractor: SysUIStateDisplaysInteractor
		@Mock private lateinit var systemUIDialogManager: SystemUIDialogManager
		@Mock private lateinit var broadcastDispatcher: BroadcastDispatcher
		private val systemClock = FakeSystemClock()
		@@ -96,7 +94,6 @@ class RecordIssueDialogDelegateTest : SysuiTestCase() {
		SystemUIDialog.Factory(
		context,
		systemUIDialogManager,
		sysUIStateDisplaysInteractor,
		broadcastDispatcher,
		mDialogTransitionAnimator,
		)