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

Commit 2e22bb88 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Ignore wallpaper enter animation" into sc-dev am: 2a7139a3 am: b98c8cab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15065052

Change-Id: Ib612f441fa3a4d07a2a7827c42c786df7b899348
parents e29ad778 b98c8cab

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -683,8 +683,9 @@ class WindowStateAnimator { 
        }

        }





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

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

        // should be controlled by AppWindowToken in general.

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

        if (mAttrType != TYPE_BASE_APPLICATION) {

        // WallpaperController should handle it.

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

            applyAnimationLocked(transit, true);

            applyAnimationLocked(transit, true);

        }

        }