Merge changes I379bd80a,I85ff5ca7 into main (09aa6610) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepository.kt

+14 −14

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import java.util.TreeMap
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.MutableSharedFlow
		import kotlinx.coroutines.flow.asSharedFlow
		import kotlinx.coroutines.flow.MutableStateFlow

		/**
		* Manages blueprint changes for the lockscreen.
		@@ -48,17 +48,14 @@ constructor(
		configurationRepository: ConfigurationRepository,
		blueprints: Set<@JvmSuppressWildcards KeyguardBlueprint>,
		) {
		private val blueprintIdMap: TreeMap<String, KeyguardBlueprint> = TreeMap()
		private val _blueprint: MutableSharedFlow<KeyguardBlueprint> = MutableSharedFlow(replay = 1)
		val blueprint: Flow<KeyguardBlueprint> = _blueprint.asSharedFlow()

		// This is TreeMap so that we can order the blueprints and assign numerical values to the
		// blueprints in the adb tool.
		private val blueprintIdMap: TreeMap<String, KeyguardBlueprint> =
		TreeMap<String, KeyguardBlueprint>().apply { putAll(blueprints.associateBy { it.id }) }
		val blueprint: MutableStateFlow<KeyguardBlueprint> = MutableStateFlow(blueprintIdMap[DEFAULT]!!)
		val refreshBluePrint: MutableSharedFlow<Unit> = MutableSharedFlow(extraBufferCapacity = 1)
		val configurationChange: Flow<Unit> = configurationRepository.onAnyConfigurationChange

		init {
		blueprintIdMap.putAll(blueprints.associateBy { it.id })
		applyBlueprint(blueprintIdMap[DEFAULT]!!)
		}

		/**
		* Emits the blueprint value to the collectors.
		*
		@@ -96,14 +93,17 @@ constructor(

		/** Emits the blueprint value to the collectors. */
		fun applyBlueprint(blueprint: KeyguardBlueprint?) {
		blueprint?.let { _blueprint.tryEmit(it) }
		if (blueprint == this.blueprint.value) {
		refreshBlueprint()
		return
		}

		blueprint?.let { this.blueprint.value = it }
		}

		/** Re-emits the last emitted blueprint value if possible. */
		fun refreshBlueprint() {
		if (_blueprint.replayCache.isNotEmpty()) {
		_blueprint.tryEmit(_blueprint.replayCache.last())
		}
		refreshBluePrint.tryEmit(Unit)
		}

		/** Prints all available blueprints to the PrintWriter. */

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt

+20 −1

Original line number	Diff line number	Diff line
		@@ -21,11 +21,15 @@ import android.content.Context
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.keyguard.data.repository.KeyguardBlueprintRepository
		import com.android.systemui.keyguard.shared.model.KeyguardBlueprint
		import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint
		import com.android.systemui.keyguard.ui.view.layout.blueprints.SplitShadeKeyguardBlueprint
		import com.android.systemui.statusbar.policy.SplitShadeStateController
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.merge
		import kotlinx.coroutines.flow.onStart
		import kotlinx.coroutines.launch

		@@ -39,7 +43,18 @@ constructor(
		private val splitShadeStateController: SplitShadeStateController,
		) {

		val blueprint = keyguardBlueprintRepository.blueprint
		/**
		* The current blueprint for the lockscreen.
		*
		* This flow can also emit the same blueprint value if refreshBlueprint is emitted.
		*/
		val blueprint: Flow<KeyguardBlueprint> =
		merge(
		keyguardBlueprintRepository.blueprint,
		keyguardBlueprintRepository.refreshBluePrint.map {
		keyguardBlueprintRepository.blueprint.value
		}
		)

		init {
		applicationScope.launch {
		@@ -91,4 +106,8 @@ constructor(
		fun refreshBlueprint() {
		keyguardBlueprintRepository.refreshBlueprint()
		}

		fun getCurrentBlueprint(): KeyguardBlueprint {
		return keyguardBlueprintRepository.blueprint.value
		}
		}

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/BaseBlueprintTransition.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.transition.TransitionValues
		import android.transition.Visibility
		import android.view.View
		import android.view.ViewGroup
		import androidx.constraintlayout.helper.widget.Layer

		class BaseBlueprintTransition : TransitionSet() {
		init {
		@@ -31,6 +32,7 @@ class BaseBlueprintTransition : TransitionSet() {
		addTransition(AlphaOutVisibility())
		.addTransition(ChangeBounds())
		.addTransition(AlphaInVisibility())
		excludeTarget(Layer::class.java, /* exclude= */ true)
		}
		class AlphaOutVisibility : Visibility() {
		override fun onDisappear(

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryTest.kt

+17 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*
		*/

		@file:OptIn(ExperimentalCoroutinesApi::class)

		package com.android.systemui.keyguard.data.repository

		import androidx.test.filters.SmallTest
		@@ -25,8 +27,10 @@ import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBl
		import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint.Companion.DEFAULT
		import com.android.systemui.util.mockito.whenever
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.test.StandardTestDispatcher
		import kotlinx.coroutines.test.TestScope
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		@@ -76,8 +80,21 @@ class KeyguardBlueprintRepositoryTest : SysuiTestCase() {
		fun testTransitionToLayout_validId() {
		assertThat(underTest.applyBlueprint(DEFAULT)).isTrue()
		}

		@Test
		fun testTransitionToLayout_invalidId() {
		assertThat(underTest.applyBlueprint("abc")).isFalse()
		}

		@Test
		fun testTransitionToSameBlueprint_refreshesBlueprint() =
		testScope.runTest {
		val refreshBlueprint by collectLastValue(underTest.refreshBluePrint)
		runCurrent()

		underTest.applyBlueprint(defaultLockscreenBlueprint)
		runCurrent()

		assertThat(refreshBlueprint).isNotNull()
		}
		}