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

Commit 9f0fa844 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Close Folder when an item is auto added to it." into ub-launcher3-master

parents 9ef673fb 44060945

src/com/android/launcher3/FolderInfo.java

+7 −0
Original line number Diff line number Diff line
@@ -114,11 +114,18 @@ public class FolderInfo extends ItemInfo { 
        }

    }



    public void prepareAutoAdd() {

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

            listeners.get(i).prepareAutoAdd();

        }

    }



    public interface FolderListener {

        public void onAdd(ShortcutInfo item);

        public void onRemove(ShortcutInfo item);

        public void onTitleChanged(CharSequence title);

        public void onItemsChanged(boolean animate);

        public void prepareAutoAdd();

    }



    public boolean hasOption(int optionFlag) {

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

+11 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC 
        mFolderIcon.growAndFadeOut();



        AnimatorSet anim = LauncherAnimUtils.createAnimatorSet();

        int width = getPaddingLeft() + getPaddingRight() + mContent.getDesiredWidth();

        int width = getFolderWidth();

        int height = getFolderHeight();



        float transX = - 0.075f * (width / 2 - getPivotX());
@@ -1047,7 +1047,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC 


        DragLayer.LayoutParams lp = (DragLayer.LayoutParams) getLayoutParams();

        DragLayer parent = (DragLayer) mLauncher.findViewById(R.id.drag_layer);

        int width = getPaddingLeft() + getPaddingRight() + mContent.getDesiredWidth();

        int width = getFolderWidth();

        int height = getFolderHeight();



        float scale = parent.getDescendantRectRelativeToSelf(mFolderIcon, sTempRect);
@@ -1121,6 +1121,10 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC 
        return Math.max(mContent.getDesiredWidth(), MIN_CONTENT_DIMEN);

    }



    private int getFolderWidth() {

        return getPaddingLeft() + getPaddingRight() + mContent.getDesiredWidth();

    }



    private int getFolderHeight() {

        return getFolderHeight(getContentAreaHeight());

    }
@@ -1407,6 +1411,11 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC 
        updateTextViewFocus();

    }



    @Override

    public void prepareAutoAdd() {

        close(false);

    }



    public void onTitleChanged(CharSequence title) {

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -980,6 +980,10 @@ public class FolderIcon extends FrameLayout implements FolderListener { 
        requestLayout();

    }



    @Override

    public void prepareAutoAdd() {

    }



    @Override

    public void onAdd(ShortcutInfo item) {

        int oldCount = mBadgeInfo.getNotificationCount();

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

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


                    @Override

                    public void run() {

                        workFolder.prepareAutoAdd();

                        for (ShortcutInfo info : workFolderApps) {

                            workFolder.add(info, false);

                        }