diff options
| author | thiruram <thiruram@google.com> | 2020-06-26 18:29:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 18:29:23 +0000 |
| commit | c629ed24f0c6ae54573d6bf3f7f01a23894bcf03 (patch) | |
| tree | e5f2926761ad5fe5212474ec9bda646b01161a47 | |
| parent | 217b39c7d7fb399578a7fc6d48b645c5d1318928 (diff) | |
| parent | e1486520758b8bfd9925980ec15348b413c05766 (diff) | |
| download | Launcher3-c629ed24f0c6ae54573d6bf3f7f01a23894bcf03.tar.gz | |
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: I0220d973bcbdcaef7354d43a4454ce87952b32c1
| -rw-r--r-- | src/com/android/launcher3/model/data/FolderInfo.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java index 05ce06a3f7..41ccbd7054 100644 --- a/src/com/android/launcher3/model/data/FolderInfo.java +++ b/src/com/android/launcher3/model/data/FolderInfo.java @@ -226,7 +226,7 @@ public class FolderInfo extends ItemInfo { } // 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 @@ public class FolderInfo extends ItemInfo { : 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); + } } /** |