am 40dc25a2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev

* commit '40dc25a250f9f1ab7abcadae2d5e8700898a0e05':
  Default to using hardware layer during fade transition.
This commit is contained in:
George Mount
2014-09-18 17:19:41 +00:00
committed by Android Git Automerger

View File

@@ -145,11 +145,20 @@ public class Fade extends Visibility {
private final View mView;
private boolean mCanceled = false;
private float mPausedAlpha = -1;
private boolean mLayerTypeChanged = false;
public FadeAnimatorListener(View view) {
mView = view;
}
@Override
public void onAnimationStart(Animator animator) {
if (mView.hasOverlappingRendering() && mView.getLayerType() == View.LAYER_TYPE_NONE) {
mLayerTypeChanged = true;
mView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
}
}
@Override
public void onAnimationCancel(Animator animator) {
mCanceled = true;
@@ -163,6 +172,9 @@ public class Fade extends Visibility {
if (!mCanceled) {
mView.setTransitionAlpha(1);
}
if (mLayerTypeChanged) {
mView.setLayerType(View.LAYER_TYPE_NONE, null);
}
}
@Override