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

Commit 68ca6820 authored by wilsonshih's avatar wilsonshih
Browse files

Fix AccessibilityController did not receive window show event. 

Regression from ag/26076104, which don't want to play enter animation
for the window below starting window.
There should still pass window show event to accessibility controller,
even when no animation occur.

Bug: 323823925
Test: atest AccessibilityMagnificationTest
Change-Id: I81dff952872743db88fb011f89be0f378cf77ad2
parent d26b5778

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

+4 −6
Original line number Diff line number Diff line
@@ -499,10 +499,6 @@ class WindowStateAnimator { 
    }



    void applyEnterAnimationLocked() {

        if (mWin.mActivityRecord != null && mWin.mActivityRecord.hasStartingWindow()) {

            // It's unnecessary to play enter animation below starting window.

            return;

        }

        final int transit;

        if (mEnterAnimationPending) {

            mEnterAnimationPending = false;
@@ -513,8 +509,10 @@ class WindowStateAnimator { 


        // We don't apply animation for application main window here since this window type

        // should be controlled by ActivityRecord in general. Wallpaper is also excluded because

        // WallpaperController should handle it.

        if (mAttrType != TYPE_BASE_APPLICATION && !mIsWallpaper) {

        // WallpaperController should handle it. Also skip play enter animation for the window

        // below starting window.

        if (mAttrType != TYPE_BASE_APPLICATION && !mIsWallpaper

                && !(mWin.mActivityRecord != null && mWin.mActivityRecord.hasStartingWindow())) {

            applyAnimationLocked(transit, true);

        }