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

Commit cac12949 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Automerger Merge Worker
Browse files

Merge "Check if username is null" into sc-dev am: 78529849 

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

Change-Id: I0604859deb0bfd5a241f5eb5899a64d0fcc022c0
parents 16d624db 78529849

core/java/android/app/people/PeopleSpaceTile.java

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class PeopleSpaceTile implements Parcelable { 
    /** Converts a {@link PeopleSpaceTile} into a {@link PeopleSpaceTile.Builder}. */

    public Builder toBuilder() {

        Builder builder =

                new Builder(mId, mUserName.toString(), mUserIcon, mIntent);

                new Builder(mId, mUserName, mUserIcon, mIntent);

        builder.setContactUri(mContactUri);

        builder.setUserHandle(mUserHandle);

        builder.setPackageName(mPackageName);
@@ -209,7 +209,7 @@ public class PeopleSpaceTile implements Parcelable { 
        private List<ConversationStatus> mStatuses;



        /** Builder for use only if a shortcut is not available for the tile. */

        public Builder(String id, String userName, Icon userIcon, Intent intent) {

        public Builder(String id, CharSequence userName, Icon userIcon, Intent intent) {

            mId = id;

            mUserName = userName;

            mUserIcon = userIcon;

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -132,7 +132,9 @@ public class PeopleSpaceActivity extends Activity { 
    /** Sets {@code tileView} with the data in {@code conversation}. */

    private void setTileView(PeopleSpaceTileView tileView, PeopleSpaceTile tile) {

        try {

            if (tile.getUserName() != null) {

                tileView.setName(tile.getUserName().toString());

            }

            tileView.setPersonIcon(getPersonIconBitmap(mContext, tile,

                    getSizeInDp(mContext, R.dimen.avatar_size_for_medium,

                            mContext.getResources().getDisplayMetrics().density)));

packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -305,7 +305,9 @@ public class PeopleTileViewHelper { 
                views.setViewVisibility(R.id.availability, View.GONE);

            }



            if (mTile.getUserName() != null) {

                views.setTextViewText(R.id.name, mTile.getUserName().toString());

            }

            views.setBoolean(R.id.image, "setClipToOutline", true);

            views.setImageViewBitmap(R.id.person_icon,

                    getPersonIconBitmap(mContext, mTile, maxAvatarSize));