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

Merge "Fix CtsAccessibilityServiceTestCases Fail" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-20 15:20:33 +00:00
committed by Android (Google) Code Review
parent 953c62a901 2726eb627d
commit 82150f3f7b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1296,12 +1296,6 @@ class WindowStateAnimator {
return; 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; final int transit;
if (mEnterAnimationPending) { if (mEnterAnimationPending) {
mEnterAnimationPending = false; mEnterAnimationPending = false;
@@ -1309,7 +1303,13 @@ class WindowStateAnimator {
} else { } else {
transit = WindowManagerPolicy.TRANSIT_SHOW; transit = WindowManagerPolicy.TRANSIT_SHOW;
} }
applyAnimationLocked(transit, true);
// 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) { if (mService.mAccessibilityController != null) {
mService.mAccessibilityController.onWindowTransitionLocked(mWin, transit); mService.mAccessibilityController.onWindowTransitionLocked(mWin, transit);
} }