Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15872212 authored by thiruram's avatar thiruram Committed by Automerger Merge Worker
Browse files

Fixes missing folder label after launcher restarts. am: e1486520 am: aa823d10 

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

Change-Id: I03107d6f800e60ee174801ebd4a5e7f96827bc74
parents 22f9efe0 aa823d10

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

+10 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }



    /**