commit 2eac20e3789bbd3d47d07a291d85fec9a7c53772
author Andy Wickham <awickham@google.com> Wed Feb 19 23:51:20 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 23:51:20 2020 +0000
tree 3c8333349c7f1812911c3b1c4d68e1e6932dde40
parent b3c991f7d344966a1892efd1a4077ad9b6d91161
parent 63b7f36338c5ccce05b97d8fa16e740142360d4a

Merge "Renames BackGestureTutorialActivity to GestureSandboxActivity." into ub-launcher3-master

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

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 1d79e01..c72509e 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -487,9 +487,9 @@
                 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

diff --git a/src/com/android/launcher3/folder/FolderNameInfo.java b/src/com/android/launcher3/folder/FolderNameInfo.java
index eb9da90..ecbe46c 100644
--- a/src/com/android/launcher3/folder/FolderNameInfo.java
+++ b/src/com/android/launcher3/folder/FolderNameInfo.java
@@ -80,4 +80,10 @@
     public int describeContents() {
         return 0;
     }
+
+    @Override
+    @NonNull
+    public String toString() {
+        return mLabel.toString() + ":" + mScore;
+    }
 }