From a4bd9a80b7bc5811e36387f0d2e4e199d7ef68ca Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Thu, 29 Apr 2021 11:39:17 -0400 Subject: [PATCH] Use themed context to inflate user switcher items Test: manual Test: atest UserDetailViewAdapterTest Fixes: 186646842 Change-Id: I711b15ba353517b43945bd0eec051f0eb2df962f --- .../src/com/android/systemui/qs/tiles/UserDetailView.java | 2 +- .../com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java index 2458223310cfe..a9723341e7870 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java @@ -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 { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt index af75f2c661955..3a3d1546984d1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt @@ -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))