| commit | 0ed72b3e35a0ac998f57a1a6d71c8fb9e694904c | [log] [tgz] |
|---|---|---|
| author | thiruram <thiruram@google.com> | Fri Jun 26 18:57:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 18:57:26 2020 +0000 |
| tree | d1dbd6378d2e36f823e7f3d60e3a99badaef44df | |
| parent | e579cfddc504bf8837bcdbd4414728606d31e6ed [diff] | |
| parent | 15872212983e78920c9b27c5225a24d05b0ff8cc [diff] |
Fixes missing folder label after launcher restarts. am: e148652075 am: aa823d103e am: 1587221298 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12003751 Change-Id: I6d817e9284cc4ffbdafcb97b48f693f3d96f6e1a
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); + } } /**