Tweaking drop target transition to prevent flash.
Change-Id: I7a0204685f1d377117b4d8e39b1c0d32e7b37a76
diff --git a/res/values/config.xml b/res/values/config.xml
index f03ded7..fca0acc 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -47,7 +47,7 @@
<!-- Workspace -->
<!-- The transition duration for the background of the drop targets -->
- <integer name="config_dropTargetBgTransitionDuration">200</integer>
+ <integer name="config_dropTargetBgTransitionDuration">100</integer>
<integer name="config_crosshairsFadeInTime">600</integer>
diff --git a/src/com/android/launcher2/DeleteDropTarget.java b/src/com/android/launcher2/DeleteDropTarget.java
index afa2654..c8c6faa 100644
--- a/src/com/android/launcher2/DeleteDropTarget.java
+++ b/src/com/android/launcher2/DeleteDropTarget.java
@@ -113,6 +113,7 @@
}
mActive = isVisible;
+ mDrawable.resetTransition();
setVisibility(isVisible ? View.VISIBLE : View.GONE);
if (mText.getText().length() > 0) {
mText.setText(isUninstall ? R.string.delete_target_uninstall_label
@@ -135,7 +136,9 @@
public void onDragExit(DragObject d) {
super.onDragExit(d);
- mDrawable.resetTransition();
+ if (!d.dragComplete) {
+ mDrawable.resetTransition();
+ }
}
public void onDrop(DragObject d) {
diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/android/launcher2/InfoDropTarget.java
index c7812e3..02e3f01 100644
--- a/src/com/android/launcher2/InfoDropTarget.java
+++ b/src/com/android/launcher2/InfoDropTarget.java
@@ -97,6 +97,7 @@
}
mActive = isVisible;
+ mDrawable.resetTransition();
setVisibility(isVisible ? View.VISIBLE : View.GONE);
}
@@ -115,6 +116,8 @@
public void onDragExit(DragObject d) {
super.onDragExit(d);
- mDrawable.resetTransition();
+ if (!d.dragComplete) {
+ mDrawable.resetTransition();
+ }
}
}
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java
index 4bfb40a..e4cf361 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/android/launcher2/SearchDropTargetBar.java
@@ -33,7 +33,7 @@
public class SearchDropTargetBar extends FrameLayout implements DragController.DragListener {
private static final int sTransitionInDuration = 275;
- private static final int sTransitionOutDuration = 100;
+ private static final int sTransitionOutDuration = 125;
private ObjectAnimator mDropTargetBarFadeInAnim;
private ObjectAnimator mDropTargetBarFadeOutAnim;