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

Merge "Check if username is null" into sc-dev

Browse Source
This commit is contained in:
Flavio Fiszman
2021-04-23 15:59:09 +00:00
committed by Android (Google) Code Review
parent 8cf06f75a6 249cef5cf5
commit 7852984973
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/people/PeopleSpaceTile.java
View File

@@ -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;

4
packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
View File

@@ -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 {
tileView.setName(tile.getUserName().toString());
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)));

4
packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
View File

@@ -305,7 +305,9 @@ public class PeopleTileViewHelper {
views.setViewVisibility(R.id.availability, View.GONE);
}
views.setTextViewText(R.id.name, mTile.getUserName().toString());
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));