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

Commit 39bc28ba authored by Jon Miranda's avatar Jon Miranda Committed by android-build-merger
Browse files

Close Folder before doing any automatic updates. 

am: 608d0dba

Change-Id: I3ea2d89d229741e78b41d320fdae00d8d8a02d6a
parents ea61fb24 608d0dba

src/com/android/launcher3/FolderInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -114,9 +114,9 @@ public class FolderInfo extends ItemInfo { 
        }

    }



    public void prepareAutoAdd() {

    public void prepareAutoUpdate() {

        for (int i = 0; i < listeners.size(); i++) {

            listeners.get(i).prepareAutoAdd();

            listeners.get(i).prepareAutoUpdate();

        }

    }
@@ -125,7 +125,7 @@ public class FolderInfo extends ItemInfo { 
        public void onRemove(ShortcutInfo item);

        public void onTitleChanged(CharSequence title);

        public void onItemsChanged(boolean animate);

        public void prepareAutoAdd();

        public void prepareAutoUpdate();

    }



    public boolean hasOption(int optionFlag) {

src/com/android/launcher3/Workspace.java

+3 −1
Original line number Diff line number Diff line
@@ -3885,7 +3885,9 @@ public class Workspace extends PagedView 
                    // The item may belong to a folder.

                    View parent = idToViewMap.get(itemToRemove.container);

                    if (parent != null) {

                        ((FolderInfo) parent.getTag()).remove((ShortcutInfo) itemToRemove, false);

                        FolderInfo folderInfo = (FolderInfo) parent.getTag();

                        folderInfo.prepareAutoUpdate();

                        folderInfo.remove((ShortcutInfo) itemToRemove, false);

                    }

                }

            }

src/com/android/launcher3/folder/Folder.java

+1 −1
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC 
    }



    @Override

    public void prepareAutoAdd() {

    public void prepareAutoUpdate() {

        close(false);

    }

src/com/android/launcher3/folder/FolderIcon.java

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { 
    }



    @Override

    public void prepareAutoAdd() {

    public void prepareAutoUpdate() {

    }



    @Override

src/com/android/launcher3/util/ManagedProfileHeuristic.java

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class ManagedProfileHeuristic { 


                    @Override

                    public void run() {

                        workFolder.prepareAutoAdd();

                        workFolder.prepareAutoUpdate();

                        for (ShortcutInfo info : workFolderApps) {

                            workFolder.add(info, false);

                        }