Fixing error in calculating translation animation.

Change-Id: Idd029051619f152a59653e8fb445d028f5e8672e
This commit is contained in:
Winson Chung
2014-04-04 10:37:18 -07:00
parent 2f2ca08baa
commit 00350bb3a0
2 changed files with 4 additions and 4 deletions

View File

@@ -34,7 +34,7 @@ public class RecentsConfiguration {
public Rect systemInsets = new Rect();
public Rect displayRect = new Rect();
public float animationDpsMovementPerSecond;
public float animationPxMovementPerSecond;
public int filteringCurrentViewsMinAnimDuration;
public int filteringNewViewsMinAnimDuration;
@@ -63,7 +63,7 @@ public class RecentsConfiguration {
mDisplayMetrics = dm;
displayRect.set(0, 0, dm.widthPixels, dm.heightPixels);
animationDpsMovementPerSecond =
animationPxMovementPerSecond =
res.getDimensionPixelSize(R.dimen.recents_animation_movement_in_dps_per_second);
filteringCurrentViewsMinAnimDuration =
res.getInteger(R.integer.recents_filter_animate_current_views_min_duration);

View File

@@ -29,8 +29,8 @@ public class Utilities {
}
public static int calculateTranslationAnimationDuration(int distancePx, int minDuration) {
RecentsConfiguration config = RecentsConfiguration.getInstance();
return Math.max(minDuration,
(int) (Math.abs(distancePx) / config.animationDpsMovementPerSecond) * 1000 /* ms/s */);
return Math.max(minDuration, (int) (1000f /* ms/s */ *
(Math.abs(distancePx) / config.animationPxMovementPerSecond)));
}
/** Scales a rect about its centroid */