Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "More eagerly collect isSimpleUserSwitcher." into tm-qpr-dev am: fc2e8ed238

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21336505

Change-Id: Iba35e4b61c4972f5129efffc3edb1ad6c89072b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ale Nijamkin
2023-02-08 23:49:56 +00:00
committed by Automerger Merge Worker
parent aed20ab001 fc2e8ed238
commit 4211c8a8a1
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt
View File

@@ -47,12 +47,14 @@ import kotlinx.coroutines.asExecutor
import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -120,9 +122,25 @@ constructor(
featureFlags: FeatureFlags, featureFlags: FeatureFlags,
) : UserRepository { ) : UserRepository {
private val _userSwitcherSettings = MutableStateFlow(runBlocking { getSettings() }) private val _userSwitcherSettings: StateFlow<UserSwitcherSettingsModel> =
override val userSwitcherSettings: Flow<UserSwitcherSettingsModel> = globalSettings
_userSwitcherSettings.asStateFlow().filterNotNull() .observerFlow(
names =
arrayOf(
SETTING_SIMPLE_USER_SWITCHER,
Settings.Global.ADD_USERS_WHEN_LOCKED,
Settings.Global.USER_SWITCHER_ENABLED,
),
userId = UserHandle.USER_SYSTEM,
)
.onStart { emit(Unit) } // Forces an initial update.
.map { getSettings() }
.stateIn(
scope = applicationScope,
started = SharingStarted.Eagerly,
initialValue = runBlocking { getSettings() },
)
override val userSwitcherSettings: Flow<UserSwitcherSettingsModel> = _userSwitcherSettings
private val _userInfos = MutableStateFlow<List<UserInfo>?>(null) private val _userInfos = MutableStateFlow<List<UserInfo>?>(null)
override val userInfos: Flow<List<UserInfo>> = _userInfos.filterNotNull() override val userInfos: Flow<List<UserInfo>> = _userInfos.filterNotNull()
@@ -154,7 +172,6 @@ constructor(
init { init {
observeSelectedUser() observeSelectedUser()
observeUserSettings()
if (featureFlags.isEnabled(FACE_AUTH_REFACTOR)) { if (featureFlags.isEnabled(FACE_AUTH_REFACTOR)) {
observeUserSwitching() observeUserSwitching()
} }
@@ -237,23 +254,6 @@ constructor(
.launchIn(applicationScope) .launchIn(applicationScope)
} }
private fun observeUserSettings() {
globalSettings
.observerFlow(
names =
arrayOf(
SETTING_SIMPLE_USER_SWITCHER,
Settings.Global.ADD_USERS_WHEN_LOCKED,
Settings.Global.USER_SWITCHER_ENABLED,
),
userId = UserHandle.USER_SYSTEM,
)
.onStart { emit(Unit) } // Forces an initial update.
.map { getSettings() }
.onEach { _userSwitcherSettings.value = it }
.launchIn(applicationScope)
}
private suspend fun getSettings(): UserSwitcherSettingsModel { private suspend fun getSettings(): UserSwitcherSettingsModel {
return withContext(backgroundDispatcher) { return withContext(backgroundDispatcher) {
val isSimpleUserSwitcher = val isSimpleUserSwitcher =