Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2df1ef3c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "[User Switcher] Set default value if setting null." into... 

Merge "Merge "[User Switcher] Set default value if setting null." into tm-qpr-dev am: 37cd9ae8" into tm-qpr-dev-plus-aosp am: cae70fbf

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



Change-Id: I3047b906534216965f38b189569443063dad116c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f67304b1 cae70fbf

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

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

+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)