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

am: d20923ba8a

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

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

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();