From 30bdd6eb6994b89c99f3adaebd1de131d68d0545 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 17 Nov 2015 17:59:26 -0800
Subject: [PATCH] Stop requesting focus on folder if it was closed without
 animating.

Bug: 25092436
Change-Id: Ia6b72ec8c9fa02fc159457b81fef12f6fd394769
---
 src/com/android/launcher3/Folder.java   | 8 +++++---
 src/com/android/launcher3/Launcher.java | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 9377bad6d2..44bc8a3529 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/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();
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9824e3e3ed..0721cd2820 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/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