Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-09-11 17:25:33 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
}
}
}