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

Commit 1c02db2b authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Automerger Merge Worker
Browse files

Fixes user switcher dialog animations. am: 20fd9de9 

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



Change-Id: Iec32bd147b95e86c2b53bc20446bb18cf7fd3f9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76a9ee29 20fd9de9

packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java

+0 −9
Original line number Diff line number Diff line
@@ -204,15 +204,6 @@ public class UserDetailView extends PseudoGridView { 
            Trace.endSection();

        }



        @Override

        public void onUserListItemClicked(@NonNull UserRecord record,

                @Nullable UserSwitchDialogController.DialogShower dialogShower) {

            if (dialogShower != null) {

                mDialogShower.dismiss();

            }

            super.onUserListItemClicked(record, dialogShower);

        }



        public void linkToViewGroup(ViewGroup viewGroup) {

            PseudoGridView.ViewGroupAdapterBridge.link(viewGroup, this);

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseUserSwitcherAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ protected constructor( 
     * animation to and from the parent dialog.

     */

    @JvmOverloads

    open fun onUserListItemClicked(

    fun onUserListItemClicked(

        record: UserRecord,

        dialogShower: DialogShower? = null,

    ) {

packages/SystemUI/src/com/android/systemui/user/domain/interactor/UserInteractor.kt

+3 −1
Original line number Diff line number Diff line
@@ -443,7 +443,8 @@ constructor( 
                    )

                )

            }

            UserActionModel.ADD_SUPERVISED_USER ->

            UserActionModel.ADD_SUPERVISED_USER -> {

                dismissDialog()

                activityStarter.startActivity(

                    Intent()

                        .setAction(UserManager.ACTION_CREATE_SUPERVISED_USER)
@@ -451,6 +452,7 @@ constructor( 
                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),

                    /* dismissShade= */ true,

                )

            }

            UserActionModel.NAVIGATE_TO_USER_MANAGEMENT ->

                activityStarter.startActivity(

                    Intent(Settings.ACTION_USER_SETTINGS),

packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt

+0 −6
Original line number Diff line number Diff line
@@ -66,12 +66,6 @@ constructor( 
    private fun startHandlingDialogShowRequests() {

        applicationScope.get().launch {

            interactor.get().dialogShowRequests.filterNotNull().collect { request ->

                currentDialog?.let {

                    if (it.isShowing) {

                        it.cancel()

                    }

                }



                val (dialog, dialogCuj) =

                    when (request) {

                        is ShowDialogRequestModel.ShowAddUserDialog ->

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt

+0 −11
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.systemui.R 
import com.android.systemui.SysuiTestCase

import com.android.systemui.classifier.FalsingManagerFake

import com.android.systemui.qs.QSUserSwitcherEvent

import com.android.systemui.qs.user.UserSwitchDialogController

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

import com.android.systemui.user.data.source.UserRecord

import org.junit.Assert.assertEquals
@@ -42,7 +41,6 @@ import org.mockito.ArgumentMatchers.any 
import org.mockito.ArgumentMatchers.anyBoolean

import org.mockito.ArgumentMatchers.anyInt

import org.mockito.Mock

import org.mockito.Mockito.mock

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when`

import org.mockito.MockitoAnnotations
@@ -152,15 +150,6 @@ class UserDetailViewAdapterTest : SysuiTestCase() { 
        assertNull(adapter.users.find { it.isManageUsers })

    }



    @Test

    fun clickDismissDialog() {

        val shower: UserSwitchDialogController.DialogShower =

            mock(UserSwitchDialogController.DialogShower::class.java)

        adapter.injectDialogShower(shower)

        adapter.onUserListItemClicked(createUserRecord(current = true, guest = false), shower)

        verify(shower).dismiss()

    }



    private fun createUserRecord(current: Boolean, guest: Boolean) =

        UserRecord(

            UserInfo(0 /* id */, "name", 0 /* flags */),