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

Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev am: 73a4bfc9f8 am: 1086de18d6

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

Change-Id: Ic373bbf84f8ae5cf589f8beefafc12409e4f39c1
This commit is contained in:
Ben Murdoch
2020-07-10 16:34:34 +00:00
committed by Automerger Merge Worker
parent 656c7ad026 1086de18d6
commit 07ff7a822a
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,8 @@ public class UserDetailView extends PseudoGridView {
if (item.picture == null) { if (item.picture == null) {
v.bind(name, getDrawable(mContext, item).mutate(), item.resolveId()); v.bind(name, getDrawable(mContext, item).mutate(), item.resolveId());
} else { } else {
int avatarSize = (int) v.getResources().getDimension(R.dimen.qs_framed_avatar_size); int avatarSize =
(int) mContext.getResources().getDimension(R.dimen.qs_framed_avatar_size);
Drawable drawable = new CircleFramedDrawable(item.picture, avatarSize); Drawable drawable = new CircleFramedDrawable(item.picture, avatarSize);
drawable.setColorFilter( drawable.setColorFilter(
item.isSwitchToEnabled ? null : getDisabledUserAvatarColorFilter()); item.isSwitchToEnabled ? null : getDisabledUserAvatarColorFilter());

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
View File

@@ -288,7 +288,8 @@ public class KeyguardUserSwitcher {
if (item.picture == null) { if (item.picture == null) {
v.bind(name, getDrawable(mContext, item).mutate(), item.resolveId()); v.bind(name, getDrawable(mContext, item).mutate(), item.resolveId());
} else { } else {
int avatarSize = (int) v.getResources().getDimension(R.dimen.kg_framed_avatar_size); int avatarSize =
(int) mContext.getResources().getDimension(R.dimen.kg_framed_avatar_size);
Drawable drawable = new CircleFramedDrawable(item.picture, avatarSize); Drawable drawable = new CircleFramedDrawable(item.picture, avatarSize);
drawable.setColorFilter( drawable.setColorFilter(
item.isSwitchToEnabled ? null : getDisabledUserAvatarColorFilter()); item.isSwitchToEnabled ? null : getDisabledUserAvatarColorFilter());

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

@@ -25,6 +25,8 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.logging.testing.UiEventLoggerFake
import com.android.internal.util.UserIcons
import com.android.systemui.R
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.qs.QSUserSwitcherEvent import com.android.systemui.qs.QSUserSwitcherEvent
import com.android.systemui.statusbar.policy.UserSwitcherController import com.android.systemui.statusbar.policy.UserSwitcherController
@@ -50,10 +52,10 @@ class UserDetailViewAdapterTest : SysuiTestCase() {
@Mock private lateinit var mOtherView: View @Mock private lateinit var mOtherView: View
@Mock private lateinit var mInflatedUserDetailItemView: UserDetailItemView @Mock private lateinit var mInflatedUserDetailItemView: UserDetailItemView
@Mock private lateinit var mUserInfo: UserInfo @Mock private lateinit var mUserInfo: UserInfo
@Mock private lateinit var mPicture: Bitmap
@Mock private lateinit var mLayoutInflater: LayoutInflater @Mock private lateinit var mLayoutInflater: LayoutInflater
private lateinit var adapter: UserDetailView.Adapter private lateinit var adapter: UserDetailView.Adapter
private lateinit var uiEventLogger: UiEventLoggerFake private lateinit var uiEventLogger: UiEventLoggerFake
private lateinit var mPicture: Bitmap
@Before @Before
fun setUp() { fun setUp() {
@@ -64,6 +66,7 @@ class UserDetailViewAdapterTest : SysuiTestCase() {
`when`(mLayoutInflater.inflate(anyInt(), any(ViewGroup::class.java), anyBoolean())) `when`(mLayoutInflater.inflate(anyInt(), any(ViewGroup::class.java), anyBoolean()))
.thenReturn(mInflatedUserDetailItemView) .thenReturn(mInflatedUserDetailItemView)
adapter = UserDetailView.Adapter(mContext, mUserSwitcherController, uiEventLogger) adapter = UserDetailView.Adapter(mContext, mUserSwitcherController, uiEventLogger)
mPicture = UserIcons.convertToBitmap(mContext.getDrawable(R.drawable.ic_avatar_user))
} }
private fun clickableTest( private fun clickableTest(