Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic35f2e1c873bf8aee1b703c9c7f647ea1392ccbf
This commit is contained in:
Riddle Hsu
2021-06-23 12:18:44 +00:00
committed by Automerger Merge Worker
parent 9b8abb5641 2a7139a34f
commit 76154b126c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -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);
} }