Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 717a8843 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 39da65b2: am b029590f: Merge "Default to using hardware layer during fade... 

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

* commit '39da65b24d3e1e7ffcd52b64fa65f18cffc4650e':
  Default to using hardware layer during fade transition.
parents 6244215e 510ca08d

core/java/android/transition/Fade.java

+12 −0
Original line number Diff line number Diff line
@@ -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