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

Commit 34539396 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[User Switcher] Finish activity when switch user" into tm-dev am:... 

Merge "[User Switcher] Finish activity when switch user" into tm-dev am: f08f61e9 am: 235e73cb am: da83cbb7

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



Change-Id: I3301140a5d27dc489d5cccfe9d5e17cbd2c3708e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ae8c428 da83cbb7

packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt

+7 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import com.android.systemui.R 
import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.plugins.FalsingManager

import com.android.systemui.plugins.FalsingManager.LOW_PENALTY

import com.android.systemui.statusbar.phone.ShadeController

import com.android.systemui.settings.UserTracker

import com.android.systemui.statusbar.policy.UserSwitcherController

import com.android.systemui.statusbar.policy.UserSwitcherController.BaseUserAdapter

import com.android.systemui.statusbar.policy.UserSwitcherController.USER_SWITCH_DISABLED_ALPHA
@@ -63,7 +63,7 @@ class UserSwitcherActivity @Inject constructor( 
    private val layoutInflater: LayoutInflater,

    private val falsingManager: FalsingManager,

    private val userManager: UserManager,

    private val shadeController: ShadeController

    private val userTracker: UserTracker

) : LifecycleActivity() {



    private lateinit var parent: ViewGroup
@@ -215,6 +215,11 @@ class UserSwitcherActivity @Inject constructor( 
        initBroadcastReceiver()



        parent.post { buildUserViews() }

        userTracker.addCallback(object : UserTracker.Callback {

            override fun onUserChanged(newUser: Int, userContext: Context) {

                finish()

            }

        }, mainExecutor)

    }



    private fun showPopupMenu() {

packages/SystemUI/tests/src/com/android/systemui/user/UserSwitcherActivityTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.SysuiTestCase

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.plugins.FalsingManager

import com.android.systemui.statusbar.phone.ShadeController

import com.android.systemui.settings.UserTracker

import com.android.systemui.statusbar.policy.UserSwitcherController

import com.google.common.truth.Truth.assertThat

import org.junit.Before
@@ -50,7 +50,7 @@ class UserSwitcherActivityTest : SysuiTestCase() { 
    @Mock

    private lateinit var userManager: UserManager

    @Mock

    private lateinit var shadeController: ShadeController

    private lateinit var userTracker: UserTracker



    @Before

    fun setUp() {
@@ -61,7 +61,7 @@ class UserSwitcherActivityTest : SysuiTestCase() { 
            layoutInflater,

            falsingManager,

            userManager,

            shadeController

            userTracker

        )

    }