Merge "Fix AccessibilityController did not receive window show event." into main (fa838838) · Commits · e / os / android_frameworks_base

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