Merge "[User Switcher] Set default value if setting null." into tm-qpr-dev (37cd9ae8) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,15 @@ constructor(
		val isUserSwitcherEnabled =
		globalSettings.getIntForUser(
		Settings.Global.USER_SWITCHER_ENABLED,
		0,
		if (
		appContext.resources.getBoolean(
		com.android.internal.R.bool.config_showUserSwitcherByDefault
		)
		) {
		1
		} else {
		0
		},
		UserHandle.USER_SYSTEM,
		) != 0

+18 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,24 @@ class UserRepositoryImplTest : SysuiTestCase() {
		)
		}

		@Test
		fun userSwitcherSettings_isUserSwitcherEnabled_notInitialized() = runSelfCancelingTest {
		underTest = create(this)

		var value: UserSwitcherSettingsModel? = null
		underTest.userSwitcherSettings.onEach { value = it }.launchIn(this)

		assertUserSwitcherSettings(
		model = value,
		expectedSimpleUserSwitcher = false,
		expectedAddUsersFromLockscreen = false,
		expectedUserSwitcherEnabled =
		context.resources.getBoolean(
		com.android.internal.R.bool.config_showUserSwitcherByDefault
		),
		)
		}

		@Test
		fun refreshUsers() = runSelfCancelingTest {
		underTest = create(this)