Merge "[Spa] Use Mockito Kotlin" into main (e3412835) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/compose/Keyboards.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.LaunchedEffect
		import androidx.compose.runtime.snapshotFlow
		import androidx.compose.ui.ExperimentalComposeUiApi
		import androidx.compose.ui.platform.LocalSoftwareKeyboardController
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.filter
		@@ -29,7 +28,6 @@ import kotlinx.coroutines.flow.filter
		/**
		* An action when run, hides the keyboard if it's open.
		*/
		@OptIn(ExperimentalComposeUiApi::class)
		@Composable
		fun hideKeyboardAction(): () -> Unit {
		val keyboardController = LocalSoftwareKeyboardController.current
		@@ -41,7 +39,6 @@ fun hideKeyboardAction(): () -> Unit {
		*
		* And when user scrolling the lazy list, hides the keyboard if it's open.
		*/
		@OptIn(ExperimentalComposeUiApi::class)
		@Composable
		fun rememberLazyListStateAndHideKeyboardWhenStartScroll(): LazyListState {
		val listState = rememberLazyListState()

+2 −4

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import androidx.compose.foundation.lazy.LazyColumn
		import androidx.compose.material3.Text
		import androidx.compose.runtime.CompositionLocalProvider
		import androidx.compose.runtime.LaunchedEffect
		import androidx.compose.ui.ExperimentalComposeUiApi
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.platform.LocalSoftwareKeyboardController
		import androidx.compose.ui.platform.SoftwareKeyboardController
		@@ -32,12 +31,11 @@ import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.Mockito.never
		import org.mockito.Mockito.verify
		import org.mockito.junit.MockitoJUnit
		import org.mockito.junit.MockitoRule
		import org.mockito.kotlin.never
		import org.mockito.kotlin.verify

		@OptIn(ExperimentalComposeUiApi::class)
		@RunWith(AndroidJUnit4::class)
		class KeyboardsTest {
		@get:Rule

+3 −3

Original line number	Diff line number	Diff line
		@@ -31,10 +31,10 @@ import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.Mockito.anyInt
		import org.mockito.junit.MockitoJUnit
		import org.mockito.junit.MockitoRule
		import org.mockito.Mockito.`when` as whenever
		import org.mockito.kotlin.any
		import org.mockito.kotlin.whenever

		@RunWith(AndroidJUnit4::class)
		class SettingsThemeTest {
		@@ -55,7 +55,7 @@ class SettingsThemeTest {
		@Before
		fun setUp() {
		whenever(context.resources).thenReturn(resources)
		whenever(resources.getString(anyInt())).thenReturn("")
		whenever(resources.getString(any())).thenReturn("")
		}

		private fun mockAndroidConfig(configName: String, configValue: String) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,9 +32,9 @@ import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.Mockito.verify
		import org.mockito.junit.MockitoJUnit
		import org.mockito.junit.MockitoRule
		import org.mockito.kotlin.verify

		@RunWith(AndroidJUnit4::class)
		class AnnotatedTextTest {

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,9 +33,9 @@ import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.Mockito.verify
		import org.mockito.junit.MockitoJUnit
		import org.mockito.junit.MockitoRule
		import org.mockito.kotlin.verify

		@RunWith(AndroidJUnit4::class)
		class SettingsScaffoldTest {