Fixes missing folder label after launcher restarts. am: e148652075 am: aa823d103e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12003751 Change-Id: If502df5ea45afb35ea4e51569ddf8bda999c940e
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user