diff options
-rw-r--r-- | res/values/config.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/DeleteDropTarget.java | 5 | ||||
-rw-r--r-- | src/com/android/launcher2/InfoDropTarget.java | 5 | ||||
-rw-r--r-- | src/com/android/launcher2/SearchDropTargetBar.java | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index f03ded71f..fca0acce0 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 afa2654ee..c8c6faaf9 100644 --- a/src/com/android/launcher2/DeleteDropTarget.java +++ b/src/com/android/launcher2/DeleteDropTarget.java @@ -113,6 +113,7 @@ public class DeleteDropTarget extends ButtonDropTarget { } 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 class DeleteDropTarget extends ButtonDropTarget { 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 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(); + } } } diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java index 4bfb40af2..e4cf361bb 100644 --- a/src/com/android/launcher2/SearchDropTargetBar.java +++ b/src/com/android/launcher2/SearchDropTargetBar.java @@ -33,7 +33,7 @@ import com.android.launcher.R; 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; |