summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/CellLayout.java
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2011-01-20 13:30:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-20 13:30:29 -0800
commitb17e140a07039604a33209ad2555a5586565cd37 (patch)
tree2bcbc3c55d5a6a7064a11b04e601cd10250716ad /src/com/android/launcher2/CellLayout.java
parent378fc245b35961adacf98bac41ae080b30cb4418 (diff)
parente3887cc4ec3cebda2333298e56a35acb49ccdf13 (diff)
downloadandroid_packages_apps_Trebuchet-b17e140a07039604a33209ad2555a5586565cd37.tar.gz
android_packages_apps_Trebuchet-b17e140a07039604a33209ad2555a5586565cd37.tar.bz2
android_packages_apps_Trebuchet-b17e140a07039604a33209ad2555a5586565cd37.zip
Merge "Ensure drag outline & crosshairs disappear on drag cancel" into honeycomb
Diffstat (limited to 'src/com/android/launcher2/CellLayout.java')
-rw-r--r--src/com/android/launcher2/CellLayout.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 32497249c..49ae65290 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -1342,9 +1342,7 @@ public class CellLayout extends ViewGroup implements VisibilityChangedListener {
lp.isDragging = false;
lp.dropped = true;
lp.animateDrop = animate;
- if (animate) {
- child.setVisibility(View.INVISIBLE);
- }
+ child.setVisibility(animate ? View.INVISIBLE : View.VISIBLE);
child.requestLayout();
}
}