Merge "Improve Visibility parent value check." into lmp-dev (24e08d06) · Commits · e / os / android_frameworks_base

core/java/android/transition/Visibility.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -358,12 +358,16 @@ public abstract class Visibility extends Transition {
		overlayView = startView;
		} else if (startView.getParent() instanceof View) {
		View startParent = (View) startView.getParent();
		if (!isValidTarget(startParent)) {
		if (startView.isAttachedToWindow()) {
		VisibilityInfo parentVisibilityInfo = null;
		TransitionValues endParentValues = getMatchedTransitionValues(startParent,
		true);
		if (endParentValues != null) {
		TransitionValues startParentValues = getTransitionValues(startParent, true);
		parentVisibilityInfo =
		getVisibilityChangeInfo(startParentValues, endParentValues);
		}
		if (parentVisibilityInfo == null \|\| !parentVisibilityInfo.visibilityChange) {
		overlayView = copyViewImage(startView);
		} else {
		overlayView = startView;
		}
		} else if (startParent.getParent() == null) {
		int id = startParent.getId();
		if (id != View.NO_ID && sceneRoot.findViewById(id) != null