From 00350bb3a03e15cbde74db9a07ab98eb08b4e4df Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 4 Apr 2014 10:37:18 -0700 Subject: [PATCH] Fixing error in calculating translation animation. Change-Id: Idd029051619f152a59653e8fb445d028f5e8672e --- .../com/android/systemui/recents/RecentsConfiguration.java | 4 ++-- .../SystemUI/src/com/android/systemui/recents/Utilities.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java index 5d58a0989cff2..4a0de0bae1183 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/recents/Utilities.java b/packages/SystemUI/src/com/android/systemui/recents/Utilities.java index 9538ad0bba679..4a1b3b2749b54 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Utilities.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Utilities.java @@ -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 */