commit eacbdd3cde3c32530c057ab878753b0b1489d475
author Pinyao Ting <pinyaoting@google.com> Mon Dec 02 17:13:37 2019 -0800
committer Pinyao Ting <pinyaoting@google.com> Thu Dec 05 11:35:14 2019 -0800
tree 4c16cf90fa22ac419ff94ba01a3dc5e19145aa9e
parent ec30c5ed51e470ab323fae9e26b478318b160d96

allow smart folder to support more than 2 items

Bug: 144975153
Test: Manual
Change-Id: Ib5ff34863312d8b8da7615371e353bb697261790

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]);