diff options
| author | Winson Chung <winsonc@google.com> | 2012-04-09 18:30:07 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-04-09 18:30:31 -0700 |
| commit | 9658b1e65932f0149a596f451e0bd966e7ee4e74 (patch) | |
| tree | c2dc24f830ac8aadf0a22d943b1f5f2d60fc5570 | |
| parent | e9bafe991b5bbcd033e1f27c66ba254d55117b20 (diff) | |
| download | android_packages_apps_Trebuchet-9658b1e65932f0149a596f451e0bd966e7ee4e74.tar.gz android_packages_apps_Trebuchet-9658b1e65932f0149a596f451e0bd966e7ee4e74.tar.bz2 android_packages_apps_Trebuchet-9658b1e65932f0149a596f451e0bd966e7ee4e74.zip | |
Tweaking fling-to-delete to make the fade out animation longer and harder to trigger.
Change-Id: Ie444420d2cf81e209d4bbca9c77edaad39bda000
| -rw-r--r-- | src/com/android/launcher2/DeleteDropTarget.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher2/DeleteDropTarget.java b/src/com/android/launcher2/DeleteDropTarget.java index 7e4225be4..d8ea6ef5c 100644 --- a/src/com/android/launcher2/DeleteDropTarget.java +++ b/src/com/android/launcher2/DeleteDropTarget.java @@ -38,6 +38,7 @@ import com.android.launcher.R; public class DeleteDropTarget extends ButtonDropTarget { private static int DELETE_ANIMATION_DURATION = 285; + private static int FLIND_DELETE_ANIMATION_DURATION = 350; private static int MODE_FLING_DELETE_TO_TRASH = 0; private static int MODE_FLING_DELETE_ALONG_VECTOR = 1; @@ -307,7 +308,7 @@ public class DeleteDropTarget extends ButtonDropTarget { private long mPrevTime; private boolean mHasOffsetForScale; - private final TimeInterpolator mAlphaInterpolator = new DecelerateInterpolator(1.5f); + private final TimeInterpolator mAlphaInterpolator = new DecelerateInterpolator(0.75f); public FlingAlongVectorAnimatorUpdateListener(DragLayer dragLayer, PointF vel, Rect from, long startTime) { @@ -373,7 +374,7 @@ public class DeleteDropTarget extends ButtonDropTarget { final ViewConfiguration config = ViewConfiguration.get(mLauncher); final DragLayer dragLayer = mLauncher.getDragLayer(); - final int duration = DELETE_ANIMATION_DURATION; + final int duration = FLIND_DELETE_ANIMATION_DURATION; final long startTime = AnimationUtils.currentAnimationTimeMillis(); // NOTE: Because it takes time for the first frame of animation to actually be diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index 2a1d65adc..aec8940d8 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -63,7 +63,7 @@ public class DragController { static final int SCROLL_RIGHT = 1; private static final float MAX_FLING_DEGREES = 35f; - private static final int FLING_TO_DELETE_THRESHOLD_Y_VELOCITY = -1400; + private static final int FLING_TO_DELETE_THRESHOLD_Y_VELOCITY = -1500; private Launcher mLauncher; private Handler mHandler; |