summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author wilsonshih <wilsonshih@google.com> 2024-02-06 15:59:30 +0800
committer wilsonshih <wilsonshih@google.com> 2024-02-06 15:59:30 +0800
commit68ca6820084c45213d9df95ecebf96ea070e459b (patch)
tree1a1271010c780bdf182c6c95b2e461bb627c5fa8
parentd26b5778b26036bae1dac509727b66f8c516b609 (diff)
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
-rw-r--r--services/core/java/com/android/server/wm/WindowStateAnimator.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 09c4f7ca3c6c..6428591d8b8d 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -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);
}