summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/trebuchet/FolderIcon.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-03-13 12:55:46 +0100
committerArne Coucheron <arco68@gmail.com>2013-08-12 16:53:07 +0200
commit0ad71cd7c188bb29a9e4827efb92d45cb9a5d012 (patch)
tree06c0a504de2dc57d7313d281b6385fc0a4aea8ce /src/com/cyanogenmod/trebuchet/FolderIcon.java
parent3a397cbf7fcece384ac2d3a65f61058015b4db36 (diff)
downloadandroid_packages_apps_Trebuchet-0ad71cd7c188bb29a9e4827efb92d45cb9a5d012.tar.gz
android_packages_apps_Trebuchet-0ad71cd7c188bb29a9e4827efb92d45cb9a5d012.tar.bz2
android_packages_apps_Trebuchet-0ad71cd7c188bb29a9e4827efb92d45cb9a5d012.zip
Fix jumps in the beginning of animations
If the first draw frame of an animation is expensive, which it often is, it causes a big jump. Added a helper class which automatically adjusts the animation start time if the first frame is more than 16ms. Change-Id: I100edbc41c2abe930a32d6bcf0a782ea9735f7f9
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/FolderIcon.java')
-rw-r--r--src/com/cyanogenmod/trebuchet/FolderIcon.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/trebuchet/FolderIcon.java b/src/com/cyanogenmod/trebuchet/FolderIcon.java
index 7d0a7115c..ed5ef53e7 100644
--- a/src/com/cyanogenmod/trebuchet/FolderIcon.java
+++ b/src/com/cyanogenmod/trebuchet/FolderIcon.java
@@ -191,7 +191,7 @@ public class FolderIcon extends LinearLayout implements FolderListener {
if (mNeutralAnimator != null) {
mNeutralAnimator.cancel();
}
- mAcceptAnimator = LauncherAnimUtils.ofFloat(0f, 1f);
+ mAcceptAnimator = LauncherAnimUtils.ofFloat(mCellLayout, 0f, 1f);
mAcceptAnimator.setDuration(CONSUMPTION_ANIMATION_DURATION);
final int previewSize = sPreviewSize;
@@ -220,7 +220,7 @@ public class FolderIcon extends LinearLayout implements FolderListener {
if (mAcceptAnimator != null) {
mAcceptAnimator.cancel();
}
- mNeutralAnimator = LauncherAnimUtils.ofFloat(0f, 1f);
+ mNeutralAnimator = LauncherAnimUtils.ofFloat(mCellLayout, 0f, 1f);
mNeutralAnimator.setDuration(CONSUMPTION_ANIMATION_DURATION);
final int previewSize = sPreviewSize;
@@ -563,7 +563,7 @@ public class FolderIcon extends LinearLayout implements FolderListener {
final float transY0 = (mAvailableSpaceInPreview - d.getIntrinsicHeight()) / 2;
mAnimParams.drawable = d;
- ValueAnimator va = LauncherAnimUtils.ofFloat(0f, 1.0f);
+ ValueAnimator va = LauncherAnimUtils.ofFloat(this, 0f, 1.0f);
va.addUpdateListener(new AnimatorUpdateListener(){
public void onAnimationUpdate(ValueAnimator animation) {
float progress = (Float) animation.getAnimatedValue();