Merge "Remove ExperimentalCoroutinesApi opt-ins from compose/" into main (a5146c80) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/facade/enabled/src/com/android/systemui/scene/LockscreenSceneModule.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import dagger.Module
		import dagger.Provides
		import dagger.multibindings.IntoSet
		import javax.inject.Provider
		import kotlinx.coroutines.ExperimentalCoroutinesApi

		@Module(includes = [LockscreenSceneBlueprintModule::class])
		interface LockscreenSceneModule {
		@@ -43,7 +42,6 @@ interface LockscreenSceneModule {

		companion object {

		@OptIn(ExperimentalCoroutinesApi::class)
		@Provides
		@SysUISingleton
		@KeyguardRootView

+0 −5

Original line number	Diff line number	Diff line
		@@ -57,9 +57,7 @@ import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerMessageAreaVie
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerUdfpsIconViewModel
		import com.android.systemui.log.LongPressHandlingViewLogger
		import com.android.systemui.res.R
		import kotlinx.coroutines.ExperimentalCoroutinesApi

		@ExperimentalCoroutinesApi
		@Composable
		fun AlternateBouncer(
		alternateBouncerDependencies: AlternateBouncerDependencies,
		@@ -127,7 +125,6 @@ fun AlternateBouncer(
		}
		}

		@ExperimentalCoroutinesApi
		@Composable
		private fun StatusMessage(
		viewModel: AlternateBouncerMessageAreaViewModel,
		@@ -156,7 +153,6 @@ private fun StatusMessage(
		}
		}

		@ExperimentalCoroutinesApi
		@Composable
		private fun DeviceEntryIcon(
		viewModel: AlternateBouncerUdfpsIconViewModel,
		@@ -179,7 +175,6 @@ private fun DeviceEntryIcon(
		}

		/** TODO (b/353955910): Validate accessibility CUJs */
		@ExperimentalCoroutinesApi
		@Composable
		private fun UdfpsA11yOverlay(
		viewModel: AlternateBouncerUdfpsAccessibilityOverlayViewModel,

+0 −3

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@
		* limitations under the License.
		*/

		@file:OptIn(ExperimentalCoroutinesApi::class)

		package com.android.systemui.scene.ui.composable

		import androidx.compose.runtime.snapshotFlow
		@@ -26,7 +24,6 @@ import com.android.compose.animation.scene.TransitionKey
		import com.android.compose.animation.scene.observableTransitionState
		import com.android.systemui.scene.shared.model.SceneDataSource
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.SharingStarted
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.flatMapLatest

+0 −3

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@
		* limitations under the License.
		*/

		@file:OptIn(ExperimentalCoroutinesApi::class)

		package com.android.compose.nestedscroll

		import androidx.compose.foundation.gestures.FlingBehavior
		@@ -28,7 +26,6 @@ import androidx.compose.ui.unit.Velocity
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.compose.test.runMonotonicClockTest
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.coroutineScope
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.test.runTest

+1 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@ package com.android.compose.test
		import androidx.compose.ui.test.ExperimentalTestApi
		import androidx.compose.ui.test.TestMonotonicFrameClock
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.test.TestCoroutineScheduler
		import kotlinx.coroutines.test.TestScope
		import kotlinx.coroutines.test.runTest
		@@ -18,7 +17,7 @@ import kotlinx.coroutines.withContext
		* Note: Please refer to the documentation for [runTest], as this feature utilizes it. This will
		* provide a comprehensive understanding of all its behaviors.
		*/
		@OptIn(ExperimentalTestApi::class, ExperimentalCoroutinesApi::class)
		@OptIn(ExperimentalTestApi::class)
		fun runMonotonicClockTest(block: suspend MonotonicClockTestScope.() -> Unit) = runTest {
		val testScope: TestScope = this