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

Commit 918378f0 authored by Marzia Favaro's avatar Marzia Favaro Committed by Android (Google) Code Review
Browse files

Merge "Synchronize finish callback for dim animations" into main

parents 73eb07f9 3640da9c

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

+7 −5
Original line number Original line Diff line number Diff line
@@ -171,12 +171,14 @@ public class DimmerAnimationHelper { 




        mLocalAnimationAdapter.startAnimation(dim.mDimSurface, t,

        mLocalAnimationAdapter.startAnimation(dim.mDimSurface, t,

                ANIMATION_TYPE_DIMMER, /* finishCallback */ (type, animator) -> {

                ANIMATION_TYPE_DIMMER, /* finishCallback */ (type, animator) -> {

                    synchronized (dim.mHostContainer.mWmService.mGlobalLock) {

                        setAlphaBlur(dim.mDimSurface, targetAlpha, targetBlur, t);

                        setAlphaBlur(dim.mDimSurface, targetAlpha, targetBlur, t);

                        if (targetAlpha == 0f && !dim.isDimming()) {

                        if (targetAlpha == 0f && !dim.isDimming()) {

                            dim.remove(t);

                            dim.remove(t);

                        }

                        }

                        mLocalAnimationAdapter = null;

                        mLocalAnimationAdapter = null;

                        mAlphaAnimationSpec = null;

                        mAlphaAnimationSpec = null;

                    }

                });

                });

    }

    }