commit 32e8a96ee2929a16a7521bba6ff6efd8cbd271a3
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 06 05:29:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 06 05:29:24 2019 +0000
tree 90d15756e885e249b3f8bc7fbc0ab9cd1856df4c
parent 56c9c86fe94685425804050b90cac6e6bc96d125
parent eacbdd3cde3c32530c057ab878753b0b1489d475

Merge "allow smart folder to support more than 2 items" 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 33da582..f59a192 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -417,7 +417,8 @@
      * Show suggested folder title.
      */
     public void showSuggestedTitle(String[] suggestName) {
-        if (FeatureFlags.FOLDER_NAME_SUGGEST.get() && mInfo.contents.size() == 2) {
+        if (FeatureFlags.FOLDER_NAME_SUGGEST.get()
+                && TextUtils.isEmpty(mFolderName.getText().toString())) {
             if (suggestName.length > 0 && !TextUtils.isEmpty(suggestName[0])) {
                 mFolderName.setHint(suggestName[0]);
                 mFolderName.setText(suggestName[0]);