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

Commit e89a95b3 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Fix showing views after failed transition to translucent window." into... 

Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev am: 2f35f15a
am: 87f68c84

Change-Id: I70b6b8ca3e61d53de0d03df914295ed655b12755
parents cdbae800 87f68c84

core/java/android/app/ActivityTransitionCoordinator.java

+5 −2
Original line number Diff line number Diff line
@@ -1006,9 +1006,12 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
        final int numElements = mTransitioningViews == null ? 0 : mTransitioningViews.size();

        for (int i = 0; i < numElements; i++) {

            final View view = mTransitioningViews.get(i);

            view.setTransitionVisibility(visiblity);

            if (invalidate) {

                view.invalidate();

                // Allow the view to be invalidated by the visibility change

                view.setVisibility(visiblity);

            } else {

                // Don't invalidate the view with the visibility change

                view.setTransitionVisibility(visiblity);

            }

        }

    }