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

Merge "Revert "Accept a Window as shown if it's in any transition"" into udc-dev am: 2cc234650b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22784152

Change-Id: If9521bd7d8ea49c825baaed843a643f4b55836d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Robin Lee
2023-04-27 13:35:00 +00:00
committed by Automerger Merge Worker
parent d3fe856bb1 2cc234650b
commit 89f100c708
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

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