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

am: 680f73bf46

* commit '680f73bf4643f57d3e1cc8791b186944a65ab9d9':
  Fix clipping not being activated on children in groups

Change-Id: I65a3ae33c0cb4934ed4a52d6e94194705fdac44c
This commit is contained in:
Mady Mellor
2016-05-25 20:40:30 +00:00
committed by android-build-merger

View File

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