Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d83aa9 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev

parents d86734b4 e988ee1e
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -277,6 +277,18 @@ public abstract class Visibility extends Transition {
        if ((mMode & MODE_IN) != MODE_IN || endValues == null) {
            return null;
        }
        if (startValues == null) {
            VisibilityInfo parentVisibilityInfo = null;
            View endParent = (View) endValues.view.getParent();
            TransitionValues startParentValues = getMatchedTransitionValues(endParent,
                                                                            false);
            TransitionValues endParentValues = getTransitionValues(endParent, false);
            parentVisibilityInfo =
                getVisibilityChangeInfo(startParentValues, endParentValues);
            if (parentVisibilityInfo.visibilityChange) {
                return null;
            }
        }
        return onAppear(sceneRoot, endValues.view, startValues, endValues);
    }