Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7341e22 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fixing error in calculating translation animation."

parents e8cfc94e 00350bb3

packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

packages/SystemUI/src/com/android/systemui/recents/Utilities.java

+2 −2
Original line number Diff line number Diff line
@@ -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 */