diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-02-14 16:45:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-14 16:45:40 -0800 |
| commit | 038085598ca6180688767f90a759a5eda30e2daa (patch) | |
| tree | 857bfd96d31144082314afb2794ad58293c51650 /src | |
| parent | 78034235d14fef0a9524a4b2f254ea4b76e83b98 (diff) | |
| parent | 82ac8a24883a3495a96189a6e5eb307f50177e0e (diff) | |
| download | android_packages_apps_Trebuchet-038085598ca6180688767f90a759a5eda30e2daa.tar.gz android_packages_apps_Trebuchet-038085598ca6180688767f90a759a5eda30e2daa.tar.bz2 android_packages_apps_Trebuchet-038085598ca6180688767f90a759a5eda30e2daa.zip | |
Merge "Fixing annoying bug where widget would drop to side page"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 704138eac..9274f8134 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -2674,8 +2674,7 @@ public class Workspace extends SmoothPagedView public void onDragOver(DragObject d) { // Skip drag over events while we are dragging over side pages - if (mInScrollArea) return; - if (mIsSwitchingState) return; + if (mInScrollArea || mIsSwitchingState || mState == State.SMALL) return; Rect r = new Rect(); CellLayout layout = null; |