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

DO NOT MERGE Revert "Accept a Window as shown if it's in any transition"

Browse Source 
This reverts commit 8ed3e4a826.

Reason for revert: Task embedding flicker b/276472426
Fix: 276472426

Change-Id: I81a41081ff5905cba35930f1a0de04c2000b5dfa
This commit is contained in:
Robin Lee
2023-04-14 14:54:16 +00:00
committed by Android (Google) Code Review
parent 8ed3e4a826
commit dd2ba83f79
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

@@ -2049,19 +2049,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() {