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

Merge "Accept a Window as shown if it's in any transition" into tm-qpr-dev

Browse Source
This commit is contained in:
Robin Lee
2023-03-21 07:30:03 +00:00
committed by Android (Google) Code Review
parent b89627e90a 8ed3e4a826
commit 0af487566d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2049,16 +2049,19 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
/**
* Like isOnScreen(), but we don't return true if the window is part
* of a transition that has not yet been started.
* of a transition but has not yet started animating.
*/
boolean isReadyForDisplay() {
if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()) {
if (!mHasSurface || mDestroying || !isVisibleByPolicy()) {
return false;
}
if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()
&& !isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_APP_TRANSITION)) {
return false;
}
final boolean parentAndClientVisible = !isParentWindowHidden()
&& mViewVisibility == View.VISIBLE && mToken.isVisible();
return mHasSurface && isVisibleByPolicy() && !mDestroying
&& (parentAndClientVisible || isAnimating(TRANSITION | PARENTS));
return parentAndClientVisible || isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_ALL);
}
boolean isFullyTransparent() {