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

am: 3f06d9ee97

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

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