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

Commit a192fa3b authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Round animation progress for computing size for background" into... 

Merge "Round animation progress for computing size for background" into oc-dr1-dev am: 75176be7 am: 0a01f065
am: ab7223b9

Change-Id: I26cc9808c11d752b7004e5a04bce665410b32a35
parents 621e08e2 ab7223b9

services/core/java/com/android/server/wm/SurfaceControlWithBackground.java

+5 −0
Original line number Diff line number Diff line
@@ -180,6 +180,11 @@ class SurfaceControlWithBackground extends SurfaceControl { 
        // Compute new scaled width and height for background that will depend on current animation

        // progress. Those consist of current crop rect for the main surface + scaled areas outside

        // of letterboxed area.

        // TODO: Because the progress is computed with low precision we're getting smaller values

        // for background width/height then screen size at the end of the animation. Will round when

        // the value is smaller then some empiric epsilon. However, this should be fixed by

        // computing correct frames for letterboxed windows in WindowState.

        d = d < 0.02f ? 0 : d;

        mWindowSurfaceController.getContainerRect(mTmpContainerRect);

        final int backgroundWidth =

                (int) (crop.width() + (mTmpContainerRect.width() - mLastWidth) * (1 - d) + 0.5);