| commit | 07a31d04acd68fb31ed26581a2c23788bf3cc83a | [log] [tgz] |
|---|---|---|
| author | thiruram <thiruram@google.com> | Fri Jun 26 00:26:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 00:26:10 2020 +0000 |
| tree | 926f778cecebba8638754ae4f207a4fb0d38cc2e | |
| parent | afd8873505f6442ac79eec7df3397ab866b5f972 [diff] | |
| parent | 6ab4da8aa0ab6edfa536a3e9931d815cd97b646d [diff] |
Fixes missing folder label after launcher restarts. am: 6ab4da8aa0 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11999547 Change-Id: I839d910fcef8e6c1d432b68e68b2ba0f3d7550c2
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); + } } /**