diff options
| author | Winson Chung <winsonc@google.com> | 2011-07-11 21:06:30 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-07-11 21:06:54 -0700 |
| commit | aaa530adc9defb8c2b1599cae27bb268d58b2ddb (patch) | |
| tree | 8ab8fc2db55f6acab93a6e4eabb83f39233de587 /src | |
| parent | 3818eaf848cce0916a8650ce49d89ec0564c3bc0 (diff) | |
| download | android_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')
| -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 |
3 files changed, 9 insertions, 3 deletions
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; |