Merge "Fix CtsAccessibilityServiceTestCases Fail" into qt-dev am: 82150f3f7b (b9f3d6f7) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -1296,12 +1296,6 @@ class WindowStateAnimator {
		return;
		}

		// We don't apply animation for application main window here since this window type
		// should be controlled by AppWindowToken in general.
		if (mAttrType == TYPE_BASE_APPLICATION) {
		return;
		}

		final int transit;
		if (mEnterAnimationPending) {
		mEnterAnimationPending = false;
		@@ -1309,7 +1303,13 @@ class WindowStateAnimator {
		} else {
		transit = WindowManagerPolicy.TRANSIT_SHOW;
		}

		// We don't apply animation for application main window here since this window type
		// should be controlled by AppWindowToken in general.
		if (mAttrType != TYPE_BASE_APPLICATION) {
		applyAnimationLocked(transit, true);
		}

		if (mService.mAccessibilityController != null) {
		mService.mAccessibilityController.onWindowTransitionLocked(mWin, transit);
		}