Merge "Correct the file name of FontScalingDialogDelegateTest" into main (51c45c00) · Commits · e / os / android_frameworks_base

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

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -50,8 +50,8 @@ import org.mockito.ArgumentMatchers.anyLong
	import org.mockito.Mock		import org.mockito.Mock
	import org.mockito.Mockito.spy		import org.mockito.Mockito.spy
	import org.mockito.Mockito.verify		import org.mockito.Mockito.verify
	import org.mockito.MockitoAnnotations
	import org.mockito.Mockito.`when` as whenever		import org.mockito.Mockito.`when` as whenever
			import org.mockito.MockitoAnnotations

	private const val ON: Int = 1		private const val ON: Int = 1
	private const val OFF: Int = 0		private const val OFF: Int = 0
	@@ -103,7 +103,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	systemClock,		systemClock,
	userTracker,		userTracker,
	mainHandler,		mainHandler,
	backgroundDelayableExecutor		backgroundDelayableExecutor,
	)		)
	)		)

	@@ -116,7 +116,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	sysuiState,		sysuiState,
	fakeBroadcastDispatcher,		fakeBroadcastDispatcher,
	mDialogTransitionAnimator,		mDialogTransitionAnimator,
	fontScalingDialogDelegate		fontScalingDialogDelegate,
	)		)

	whenever(dialogFactory.create(any(), any())).thenReturn(dialog)		whenever(dialogFactory.create(any(), any())).thenReturn(dialog)
	@@ -132,7 +132,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	systemSettings.getFloatForUser(		systemSettings.getFloatForUser(
	Settings.System.FONT_SCALE,		Settings.System.FONT_SCALE,
	/* def= */ 1.0f,		/* def= */ 1.0f,
	userTracker.userId		userTracker.userId,
	)		)

	assertThat(currentScale).isEqualTo(fontSizeValueArray[progress].toFloat())		assertThat(currentScale).isEqualTo(fontSizeValueArray[progress].toFloat())
	@@ -163,7 +163,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	systemSettings.getFloatForUser(		systemSettings.getFloatForUser(
	Settings.System.FONT_SCALE,		Settings.System.FONT_SCALE,
	/* def= */ 1.0f,		/* def= */ 1.0f,
	userTracker.userId		userTracker.userId,
	)		)
	assertThat(seekBar.getProgress()).isEqualTo(1)		assertThat(seekBar.getProgress()).isEqualTo(1)
	assertThat(currentScale).isEqualTo(fontSizeValueArray[1].toFloat())		assertThat(currentScale).isEqualTo(fontSizeValueArray[1].toFloat())
	@@ -194,7 +194,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	systemSettings.getFloatForUser(		systemSettings.getFloatForUser(
	Settings.System.FONT_SCALE,		Settings.System.FONT_SCALE,
	/* def= */ 1.0f,		/* def= */ 1.0f,
	userTracker.userId		userTracker.userId,
	)		)
	assertThat(seekBar.getProgress()).isEqualTo(fontSizeValueArray.size - 2)		assertThat(seekBar.getProgress()).isEqualTo(fontSizeValueArray.size - 2)
	assertThat(currentScale)		assertThat(currentScale)
	@@ -211,7 +211,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	secureSettings.putIntForUser(		secureSettings.putIntForUser(
	Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,		Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,
	OFF,		OFF,
	userTracker.userId		userTracker.userId,
	)		)

	// Default seekbar progress for font size is 1, click start icon to decrease the progress		// Default seekbar progress for font size is 1, click start icon to decrease the progress
	@@ -224,7 +224,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	secureSettings.getIntForUser(		secureSettings.getIntForUser(
	Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,		Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,
	/* def = */ OFF,		/* def = */ OFF,
	userTracker.userId		userTracker.userId,
	)		)
	assertThat(currentSettings).isEqualTo(ON)		assertThat(currentSettings).isEqualTo(ON)

	@@ -256,7 +256,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	systemSettings.getFloatForUser(		systemSettings.getFloatForUser(
	Settings.System.FONT_SCALE,		Settings.System.FONT_SCALE,
	/* def= */ 1.0f,		/* def= */ 1.0f,
	userTracker.userId		userTracker.userId,
	)		)
	assertThat(systemScale).isEqualTo(1.0f)		assertThat(systemScale).isEqualTo(1.0f)

	@@ -269,7 +269,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	// SeekBar interaction is finalized.		// SeekBar interaction is finalized.
	changeListener.onUserInteractionFinalized(		changeListener.onUserInteractionFinalized(
	seekBar,		seekBar,
	OnSeekBarWithIconButtonsChangeListener.ControlUnitType.SLIDER		OnSeekBarWithIconButtonsChangeListener.ControlUnitType.SLIDER,
	)		)
	backgroundDelayableExecutor.runAllReady()		backgroundDelayableExecutor.runAllReady()
	backgroundDelayableExecutor.advanceClockToNext()		backgroundDelayableExecutor.advanceClockToNext()
	@@ -280,7 +280,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() {
	systemSettings.getFloatForUser(		systemSettings.getFloatForUser(
	Settings.System.FONT_SCALE,		Settings.System.FONT_SCALE,
	/* def= */ 1.0f,		/* def= */ 1.0f,
	userTracker.userId		userTracker.userId,
	)		)
	assertThat(systemScale).isEqualTo(fontSizeValueArray[0].toFloat())		assertThat(systemScale).isEqualTo(fontSizeValueArray[0].toFloat())