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

Merge changes from topic "cherrypicker-L54500000958972424:N52900001344436566" into tm-qpr-dev-plus-aosp

Browse Source 
* changes:
  [automerge] DO NOT MERGE Revert "Accept a Window as shown if it's in any transition" 2p: dd2ba83f79
  DO NOT MERGE Revert "Accept a Window as shown if it's in any transition"
This commit is contained in:
Treehugger Robot
2023-04-19 18:02:22 +00:00
committed by Android (Google) Code Review
parent 24055eeff9 b3272fb2af
commit 5c5e56ffef
1 changed files with 4 additions and 7 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

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