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

Commit 84f17b43 authored by chaviw's avatar chaviw
Browse files

Override base isAnimating in WindowState 

WindowState overrides the isAnimating call. A new base method was added
to handle specific animation types, but the WindowState class was still
overriding the old isAnimating call. Therefore, the check for insets
provider was not handled.

Test: NexusLauncherTests
Fixes: 152657145
Change-Id: I32f5469fa992adb712779a6cb961bd3a1b44a227
parent 24875c8b

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -5009,7 +5009,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    }

    }





    @Override

    @Override

    boolean isAnimating(int flags) {

    boolean isAnimating(int flags, int typesToCheck) {





        // If we are an inset provider, all our animations are driven by the inset client, so we

        // If we are an inset provider, all our animations are driven by the inset client, so we

        // aren't really animating.

        // aren't really animating.
@@ -5017,7 +5017,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (mControllableInsetProvider != null) {

        if (mControllableInsetProvider != null) {

            return false;

            return false;

        }

        }

        return super.isAnimating(flags);

        return super.isAnimating(flags, typesToCheck);

    }

    }





    void startAnimation(Animation anim) {

    void startAnimation(Animation anim) {