summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/InfoDropTarget.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-07-11 21:06:30 -0700
committerWinson Chung <winsonc@google.com>2011-07-11 21:06:54 -0700
commitaaa530adc9defb8c2b1599cae27bb268d58b2ddb (patch)
tree8ab8fc2db55f6acab93a6e4eabb83f39233de587 /src/com/android/launcher2/InfoDropTarget.java
parent3818eaf848cce0916a8650ce49d89ec0564c3bc0 (diff)
downloadandroid_packages_apps_Trebuchet-aaa530adc9defb8c2b1599cae27bb268d58b2ddb.tar.gz
android_packages_apps_Trebuchet-aaa530adc9defb8c2b1599cae27bb268d58b2ddb.tar.bz2
android_packages_apps_Trebuchet-aaa530adc9defb8c2b1599cae27bb268d58b2ddb.zip
Tweaking drop target transition to prevent flash.
Change-Id: I7a0204685f1d377117b4d8e39b1c0d32e7b37a76
Diffstat (limited to 'src/com/android/launcher2/InfoDropTarget.java')
-rw-r--r--src/com/android/launcher2/InfoDropTarget.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/android/launcher2/InfoDropTarget.java
index c7812e3de..02e3f0182 100644
--- a/src/com/android/launcher2/InfoDropTarget.java
+++ b/src/com/android/launcher2/InfoDropTarget.java
@@ -97,6 +97,7 @@ public class InfoDropTarget extends ButtonDropTarget {
}
mActive = isVisible;
+ mDrawable.resetTransition();
setVisibility(isVisible ? View.VISIBLE : View.GONE);
}
@@ -115,6 +116,8 @@ public class InfoDropTarget extends ButtonDropTarget {
public void onDragExit(DragObject d) {
super.onDragExit(d);
- mDrawable.resetTransition();
+ if (!d.dragComplete) {
+ mDrawable.resetTransition();
+ }
}
}