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

Commit b3c991f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "null check in showLableSuggestion()." into ub-launcher3-master

parents 1e33123a 9ac4b580

src/com/android/launcher3/folder/Folder.java

+1 −1
Original line number Diff line number Diff line
@@ -487,9 +487,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo 
                nameInfos[0].getLabel())

                || nameInfos.length > 1 && nameInfos[1] != null && !isEmpty(

                nameInfos[1].getLabel());

        CharSequence firstLabel = nameInfos[0].getLabel();



        if (shouldOpen) {

            CharSequence firstLabel = nameInfos[0] == null ? "" : nameInfos[0].getLabel();

            if (!isEmpty(firstLabel)) {

                mFolderName.setHint("");

                mFolderName.setText(firstLabel);

src/com/android/launcher3/folder/FolderNameInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -80,4 +80,10 @@ public final class FolderNameInfo implements Parcelable { 
    public int describeContents() {

        return 0;

    }



    @Override

    @NonNull

    public String toString() {

        return mLabel.toString() + ":" + mScore;

    }

}