summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-11-19 00:36:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-11-19 00:36:20 +0000
commit55bd16bfdce57772691519fb894b95c7f088846e (patch)
tree7611eab056ab3dac1dbcdc2d9eb519412fe9241f /src/com/android/launcher3/Launcher.java
parent0151ff168368883301e84c7d1f790c9f2721e459 (diff)
parent30bdd6eb6994b89c99f3adaebd1de131d68d0545 (diff)
downloadandroid_packages_apps_Trebuchet-55bd16bfdce57772691519fb894b95c7f088846e.tar.gz
android_packages_apps_Trebuchet-55bd16bfdce57772691519fb894b95c7f088846e.tar.bz2
android_packages_apps_Trebuchet-55bd16bfdce57772691519fb894b95c7f088846e.zip
Merge "Stop requesting focus on folder if it was closed without animating." into ub-launcher3-burnaby-polish
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9824e3e3e..0721cd282 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