Merge "Fix clipping not being activated on children in groups" into nyc-dev

This commit is contained in:
Mady Mellor
2016-05-25 20:22:41 +00:00
committed by Android (Google) Code Review

View File

@@ -463,10 +463,8 @@ public class TransformState {
mTransformedView.animate().cancel(); mTransformedView.animate().cancel();
mTransformedView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); mTransformedView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
mTransformedView.setAlpha(visible ? 1.0f : 0.0f); mTransformedView.setAlpha(visible ? 1.0f : 0.0f);
if (visible) {
resetTransformedView(); resetTransformedView();
} }
}
public void prepareFadeIn() { public void prepareFadeIn() {
resetTransformedView(); resetTransformedView();