summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2015-09-29 17:52:30 -0700
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2015-09-29 18:11:48 -0700
commita18df62a83347694600bd0d82fd4cfa04354de97 (patch)
treee46fd79d0e5aaeef2520dd46e4999abc47108c98
parentcdc6806aa76856549077b0c9eefd18dd66cbecdd (diff)
downloadandroid_packages_apps_Trebuchet-a18df62a83347694600bd0d82fd4cfa04354de97.tar.gz
android_packages_apps_Trebuchet-a18df62a83347694600bd0d82fd4cfa04354de97.tar.bz2
android_packages_apps_Trebuchet-a18df62a83347694600bd0d82fd4cfa04354de97.zip
Trebuchet : Update grid + cancel drag on searchablesChanged
CYNGNOS-1146 Change-Id: Iaceebeebc03ab6e0dbd0fcac3a7e5e2265319c0c (cherry picked from commit af15b41e59de7600aacd86f122941617f23502db)
-rw-r--r--src/com/android/launcher3/Launcher.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 46b2ccb0b..1603200ef 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -5247,7 +5247,10 @@ public class Launcher extends Activity
mQsb = null;
}
mSearchDropTargetBar.setQsbSearchBar(getQsbBar());
- mGrid.layout(this);
+ if (mDragController.isDragging()) {
+ mDragController.cancelDrag();
+ }
+ updateDynamicGrid(false);
}
/**