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

src/com/android/launcher3/Folder.java

@@ -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();
-        mFolderIcon.requestFocus();
+        if (wasAnimated) {
+            mFolderIcon.requestFocus();
+        }
 
         if (mRearrangeOnClose) {
             rearrangeChildren();

src/com/android/launcher3/Launcher.java

@@ -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