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

Commit 1f711df8 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Use themed context to inflate user switcher items" into sc-dev am: efb81fd1 

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

Change-Id: I98c2d2885579297f04add187d572ca2e09bccf55
parents 759f835b efb81fd1

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class UserDetailView extends PseudoGridView { 
        public UserDetailItemView createUserDetailItemView(View convertView, ViewGroup parent,

                UserSwitcherController.UserRecord item) {

            UserDetailItemView v = UserDetailItemView.convertOrInflate(

                    mContext, convertView, parent);

                    parent.getContext(), convertView, parent);

            if (!item.isCurrent || item.isGuest) {

                v.setOnClickListener(this);

            } else {

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

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ class UserDetailViewAdapterTest : SysuiTestCase() { 
        mContext.addMockSystemService(Context.LAYOUT_INFLATER_SERVICE, mLayoutInflater)

        `when`(mLayoutInflater.inflate(anyInt(), any(ViewGroup::class.java), anyBoolean()))

                .thenReturn(mInflatedUserDetailItemView)

        `when`(mParent.context).thenReturn(mContext)

        adapter = UserDetailView.Adapter(mContext, mUserSwitcherController, uiEventLogger,

                falsingManagerFake)

        mPicture = UserIcons.convertToBitmap(mContext.getDrawable(R.drawable.ic_avatar_user))