commit d1137b8c89ca9578992e8897a0354d5566d5d858
author thiruram <thiruram@google.com> Fri Jun 26 18:29:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 26 18:29:13 2020 +0000
tree 8e2566873b444d97373038b87178ccbd82356536
parent b95fbd99f03ea28f869690c4a37b5fa6b26fb356
parent e1486520758b8bfd9925980ec15348b413c05766

Fixes missing folder label after launcher restarts. am: e148652075

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12003751

Change-Id: Id53a5f12ba7e83bc6d9551e9f4cbf67d17b06569

src/com/android/launcher3/model/data/FolderInfo.java

diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java
index 05ce06a..41ccbd7 100644
--- a/src/com/android/launcher3/model/data/FolderInfo.java
+++ b/src/com/android/launcher3/model/data/FolderInfo.java
@@ -226,7 +226,7 @@
         }
 
         // Updating title to same value does not change any states.
-        if (title != null && title == this.title) {
+        if (title != null && title.equals(this.title)) {
             return;
         }
 
@@ -236,7 +236,15 @@
                         : title.length() == 0 ? LabelState.EMPTY :
                                 getAcceptedSuggestionIndex().isPresent() ? LabelState.SUGGESTED
                                         : LabelState.MANUAL;
-        setOption(FLAG_MANUAL_FOLDER_NAME, newLabelState.equals(LabelState.MANUAL), modelWriter);
+
+        if (newLabelState.equals(LabelState.MANUAL)) {
+            options |= FLAG_MANUAL_FOLDER_NAME;
+        } else {
+            options &= ~FLAG_MANUAL_FOLDER_NAME;
+        }
+        if (modelWriter != null) {
+            modelWriter.updateItemInDatabase(this);
+        }
     }
 
     /**