summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSandeep Siddhartha <sansid@google.com>2013-09-27 23:59:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-27 23:59:18 +0000
commit8ad682ddda37ce6bc438895f3adb8617244d0e46 (patch)
tree6ec7edf07b1625a8aab218004eea1d9fc7b6616d /src
parentab37bce36a7bc54cfcd634df95ca08e7e6143230 (diff)
parentf2b47f13cec19c8e06754fa1c3f46892349c217f (diff)
downloadandroid_packages_apps_Trebuchet-8ad682ddda37ce6bc438895f3adb8617244d0e46.tar.gz
android_packages_apps_Trebuchet-8ad682ddda37ce6bc438895f3adb8617244d0e46.tar.bz2
android_packages_apps_Trebuchet-8ad682ddda37ce6bc438895f3adb8617244d0e46.zip
Merge "Close open folders before moving to -1" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9f7b02183..bf12d7948 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1922,6 +1922,8 @@ public class Launcher extends Activity
}
protected void moveToCustomContentScreen(boolean animate) {
+ // Close any folders that may be open.
+ closeFolder();
mWorkspace.moveToCustomContentScreen(animate);
}
/**