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

am: b6f640607b

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

Change-Id: Icf5c68956bb3c261ce27b195426ebd3aefe8b83b
This commit is contained in:
Mady Mellor
2016-05-25 20:35:51 +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() {