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

Commit 58554aed authored by Ben Murdoch's avatar Ben Murdoch Committed by Automerger Merge Worker
Browse files

Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev am: 73a4bfc9 

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

Change-Id: Iaf457d74486652b4731c99293ae6dfa190518a6d
parents 1568d918 73a4bfc9

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

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ public class UserDetailView extends PseudoGridView { 
            if (item.picture == null) {

                v.bind(name, getDrawable(mContext, item).mutate(), item.resolveId());

            } 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.setColorFilter(

                        item.isSwitchToEnabled ? null : getDisabledUserAvatarColorFilter());

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

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ public class KeyguardUserSwitcher { 
            if (item.picture == null) {

                v.bind(name, getDrawable(mContext, item).mutate(), item.resolveId());

            } 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.setColorFilter(

                        item.isSwitchToEnabled ? null : getDisabledUserAvatarColorFilter());

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

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.view.View 
import android.view.ViewGroup

import androidx.test.filters.SmallTest

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.qs.QSUserSwitcherEvent

import com.android.systemui.statusbar.policy.UserSwitcherController
@@ -50,10 +52,10 @@ class UserDetailViewAdapterTest : SysuiTestCase() { 
    @Mock private lateinit var mOtherView: View

    @Mock private lateinit var mInflatedUserDetailItemView: UserDetailItemView

    @Mock private lateinit var mUserInfo: UserInfo

    @Mock private lateinit var mPicture: Bitmap

    @Mock private lateinit var mLayoutInflater: LayoutInflater

    private lateinit var adapter: UserDetailView.Adapter

    private lateinit var uiEventLogger: UiEventLoggerFake

    private lateinit var mPicture: Bitmap



    @Before

    fun setUp() {
@@ -64,6 +66,7 @@ class UserDetailViewAdapterTest : SysuiTestCase() { 
        `when`(mLayoutInflater.inflate(anyInt(), any(ViewGroup::class.java), anyBoolean()))

                .thenReturn(mInflatedUserDetailItemView)

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

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

    }



    private fun clickableTest(