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

Commit 8e062657 authored by Chong Zhang's avatar Chong Zhang
Browse files

Fix a transparent flicker due to wrong crop 

When transfering an animation, copy over app animator transformation
in addition to the animation object itself.

bug: 28399102

Change-Id: I8694a76993476b19ec61d74680d6fc51326a18bf
parent 4ba55dc4

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -224,6 +224,12 @@ public class AppWindowAnimator { 
        if (transferWinAnimator != null) {

        if (transferWinAnimator != null) {

            mAllAppWinAnimators.remove(transferWinAnimator);

            mAllAppWinAnimators.remove(transferWinAnimator);

            toAppAnimator.mAllAppWinAnimators.add(transferWinAnimator);

            toAppAnimator.mAllAppWinAnimators.add(transferWinAnimator);

            toAppAnimator.hasTransformation = transferWinAnimator.mAppAnimator.hasTransformation;

            if (toAppAnimator.hasTransformation) {

                toAppAnimator.transformation.set(transferWinAnimator.mAppAnimator.transformation);

            } else {

                toAppAnimator.transformation.clear();

            }

            transferWinAnimator.mAppAnimator = toAppAnimator;

            transferWinAnimator.mAppAnimator = toAppAnimator;

        }

        }

    }

    }