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

Commit 09daefbb authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am ec67c4b0: Merge "Make ViewPropertyAnimator correctly damage shadow... 

am ec67c4b0: Merge "Make ViewPropertyAnimator correctly damage shadow receivers" into lmp-preview-dev

* commit 'ec67c4b0ac8095c94c424a9fc37d7b11fa098ee9':
  Make ViewPropertyAnimator correctly damage shadow receivers
parents 80d55ba8 c1073c33

core/java/android/view/ViewPropertyAnimator.java

+5 −4
Original line number Diff line number Diff line
@@ -1143,7 +1143,8 @@ public class ViewPropertyAnimator { 
                // Shouldn't happen, but just to play it safe

                return;

            }

            boolean useRenderNodeProperties = mView.mRenderNode != null;



            boolean hardwareAccelerated = mView.isHardwareAccelerated();



            // alpha requires slightly different treatment than the other (transform) properties.

            // The logic in setAlpha() is not simply setting mAlpha, plus the invalidation
@@ -1151,13 +1152,13 @@ public class ViewPropertyAnimator { 
            // We track what kinds of properties are set, and how alpha is handled when it is

            // set, and perform the invalidation steps appropriately.

            boolean alphaHandled = false;

            if (!useRenderNodeProperties) {

            if (!hardwareAccelerated) {

                mView.invalidateParentCaches();

            }

            float fraction = animation.getAnimatedFraction();

            int propertyMask = propertyBundle.mPropertyMask;

            if ((propertyMask & TRANSFORM_MASK) != 0) {

                mView.invalidateViewProperty(false, false);

                mView.invalidateViewProperty(hardwareAccelerated, false);

            }

            ArrayList<NameValuesHolder> valueList = propertyBundle.mNameValuesHolder;

            if (valueList != null) {
@@ -1173,7 +1174,7 @@ public class ViewPropertyAnimator { 
                }

            }

            if ((propertyMask & TRANSFORM_MASK) != 0) {

                if (!useRenderNodeProperties) {

                if (!hardwareAccelerated) {

                    mView.mPrivateFlags |= View.PFLAG_DRAWN; // force another invalidation

                }

            }