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

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

Merge "[Bouncer] Update userswitcher upon reset" into tm-dev am: 7fa9ff82 am: 3b94e8fc 

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



Change-Id: Idd5d97e7b3d93bb9b428926208a9228710e4def2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 174aea8c 3b94e8fc

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+8 −3
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ public class KeyguardSecurityContainer extends FrameLayout { 
    }



    public void reset() {

        mViewMode.reset();

        mDisappearAnimRunning = false;

    }
@@ -798,9 +799,6 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                mUserSwitcherViewGroup =  mView.findViewById(R.id.keyguard_bouncer_user_switcher);

            }



            Drawable userIcon = findUserIcon(KeyguardUpdateMonitor.getCurrentUser());

            ((ImageView) mView.findViewById(R.id.user_icon)).setImageDrawable(userIcon);



            updateSecurityViewLocation();



            mUserSwitcher = mView.findViewById(R.id.user_switcher_header);
@@ -813,6 +811,7 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                mPopup.dismiss();

                mPopup = null;

            }

            setupUserSwitcher();

        }



        private Drawable findUserIcon(int userId) {
@@ -858,6 +857,12 @@ public class KeyguardSecurityContainer extends FrameLayout { 


        private void setupUserSwitcher() {

            final UserRecord currentUser = mUserSwitcherController.getCurrentUserRecord();

            if (currentUser == null) {

                Log.wtf(TAG, "Current user in user switcher is null.");

                return;

            }

            Drawable userIcon = findUserIcon(currentUser.info.id);

            ((ImageView) mView.findViewById(R.id.user_icon)).setImageDrawable(userIcon);

            mUserSwitcher.setText(mUserSwitcherController.getCurrentUserName());



            ViewGroup anchor = mView.findViewById(R.id.user_switcher_anchor);

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -291,7 +291,9 @@ public class KeyguardSecurityContainerTest extends SysuiTestCase { 
    @Test

    public void testTwoOrMoreUsersDoesAllowDropDown() {

        // GIVEN one user has been setup

        when(mUserSwitcherController.getUsers()).thenReturn(buildUserRecords(2));

        ArrayList<UserRecord> records = buildUserRecords(2);

        when(mUserSwitcherController.getCurrentUserRecord()).thenReturn(records.get(0));

        when(mUserSwitcherController.getUsers()).thenReturn(records);



        // WHEN UserSwitcherViewMode is initialized

        setupUserSwitcher();