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

Commit 55bd16bf authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Stop requesting focus on folder if it was closed without animating."... 

Merge "Stop requesting focus on folder if it was closed without animating." into ub-launcher3-burnaby-polish
parents 0151ff16 30bdd6eb

src/com/android/launcher3/Folder.java

+5 −3
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
            @Override

            public void onAnimationEnd(Animator animation) {

                setLayerType(LAYER_TYPE_NONE, null);

                close();

                close(true);

            }

            @Override

            public void onAnimationStart(Animator animation) {
@@ -654,7 +654,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
        oa.start();

    }



    public void close() {

    public void close(boolean wasAnimated) {

        // TODO: Clear all active animations.

        DragLayer parent = (DragLayer) getParent();

        if (parent != null) {
@@ -662,7 +662,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
        }

        mDragController.removeDropTarget(this);

        clearFocus();

        if (wasAnimated) {

            mFolderIcon.requestFocus();

        }



        if (mRearrangeOnClose) {

            rearrangeChildren();

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -3226,7 +3226,7 @@ public class Launcher extends Activity 
        if (animate) {

            folder.animateClosed();

        } else {

            folder.close();

            folder.close(false);

        }



        // Notify the accessibility manager that this folder "window" has disappeared and no