Merge cherrypicks of ['googleplex-android-review.googlesource.com/22648062'] into tm-qpr3-release. (d4aa0f64) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowState.java

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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() {