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

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

Browse Source
This commit is contained in:
Aaron Liu
2022-04-19 14:41:30 +00:00
committed by Android (Google) Code Review
parent a20c177e33 848a7b8d35
commit f08f61e9f9
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt
View File

@@ -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() {

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

@@ -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
)
}