summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2010-11-24 13:35:32 -0800
committerMichael Jurka <mikejurka@google.com>2010-11-24 14:51:58 -0800
commit3d79192da756fa9c46215d5c39f17cd8ac7fb43e (patch)
tree59bd252338f02bb84229cd02c1bbc217c0648ba9
parent2dbae21ee92f5c6744c362c48499ff96e5cace4d (diff)
downloadandroid_packages_apps_Trebuchet-3d79192da756fa9c46215d5c39f17cd8ac7fb43e.tar.gz
android_packages_apps_Trebuchet-3d79192da756fa9c46215d5c39f17cd8ac7fb43e.tar.bz2
android_packages_apps_Trebuchet-3d79192da756fa9c46215d5c39f17cd8ac7fb43e.zip
Don't allow drags to fully occupied home screens
Change-Id: Ib9f6732f2d1d35fc4496c3d2257397ddf1f7f367
-rw-r--r--src/com/android/launcher2/Workspace.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d99e9af5a..a79d236b0 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1483,7 +1483,7 @@ public class Workspace extends SmoothPagedView
// If it's an external drop (e.g. from All Apps), check if it should be accepted
if (source != this) {
// Don't accept the drop if we're not over a screen at time of drop
- if (mDragTargetLayout == null) {
+ if (mDragTargetLayout == null || !mDragTargetLayout.getAcceptsDrops()) {
return false;
}
@@ -1931,7 +1931,7 @@ public class Workspace extends SmoothPagedView
mDragTargetLayout.setHover(false);
}
mDragTargetLayout = layout;
- if (mDragTargetLayout != null) {
+ if (mDragTargetLayout != null && mDragTargetLayout.getAcceptsDrops()) {
mDragTargetLayout.setHover(true);
}
}