summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-09-09 11:34:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-09 11:34:13 -0700
commita1c7ff12192b3bf670f7870f22b0f9b8ed161289 (patch)
tree74ea6e0197bee4c6f7f70b20316c44c89b8588d0
parentce39bfdb168d45018cec989eccc7a4754f1ea900 (diff)
parent09bfc45ae8aee2db579698c15007b1d138b4141f (diff)
downloadandroid_packages_apps_Trebuchet-a1c7ff12192b3bf670f7870f22b0f9b8ed161289.tar.gz
android_packages_apps_Trebuchet-a1c7ff12192b3bf670f7870f22b0f9b8ed161289.tar.bz2
android_packages_apps_Trebuchet-a1c7ff12192b3bf670f7870f22b0f9b8ed161289.zip
Merge "Fixing small regression where dropping from a folder causes the search bar to flash."
-rw-r--r--src/com/android/launcher2/Launcher.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 29ce4c2d9..255bf06d6 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2304,6 +2304,8 @@ public final class Launcher extends Activity
}
void exitSpringLoadedDragModeDelayed(final boolean successfulDrop, boolean extendedDelay) {
+ if (mState != State.APPS_CUSTOMIZE_SPRING_LOADED) return;
+
mHandler.postDelayed(new Runnable() {
@Override
public void run() {