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

Commit 6b24f500 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Send subtree changed AccessibilityEvent for all alpha changes."... 

Merge "Merge "Send subtree changed AccessibilityEvent for all alpha changes." into qt-dev am: 37f6ad65 am: 5c8b4860" into qt-r1-dev-plus-aosp
parents 706ac6e9 30bd9530

core/java/android/view/RenderNodeAnimator.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ public class RenderNodeAnimator extends Animator { 
        // it with the final value here.

        // it with the final value here.

        if (mRenderProperty == RenderNodeAnimator.ALPHA) {

        if (mRenderProperty == RenderNodeAnimator.ALPHA) {

            mViewTarget.ensureTransformationInfo();

            mViewTarget.ensureTransformationInfo();

            mViewTarget.mTransformationInfo.mAlpha = mFinalValue;

            mViewTarget.setAlphaInternal(mFinalValue);

        }

        }





        moveToRunningState();

        moveToRunningState();

core/java/android/view/View.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -4123,7 +4123,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
         * completely transparent and 1 means completely opaque.

         * completely transparent and 1 means completely opaque.

         */

         */

        @ViewDebug.ExportedProperty

        @ViewDebug.ExportedProperty

        float mAlpha = 1f;

        private float mAlpha = 1f;

















        /**







        /**











         * The opacity of the view as manipulated by the Fade transition. This is a







         * The opacity of the view as manipulated by the Fade transition. This is a










@@ -16187,7 +16187,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,









        return false;







        return false;











    }







    }



























    private void setAlphaInternal(float alpha) {







    void setAlphaInternal(float alpha) {











        float oldAlpha = mTransformationInfo.mAlpha;







        float oldAlpha = mTransformationInfo.mAlpha;











        mTransformationInfo.mAlpha = alpha;







        mTransformationInfo.mAlpha = alpha;











        // Report visibility changes, which can affect children, to accessibility







        // Report visibility changes, which can affect children, to accessibility

























core/java/android/view/ViewPropertyAnimator.java



+2
−3




























Original line number
Original line
Diff line number
Diff line








@@ -972,7 +972,6 @@ public class ViewPropertyAnimator {









     * @param value The value to set the property to







     * @param value The value to set the property to











     */







     */











    private void setValue(int propertyConstant, float value) {







    private void setValue(int propertyConstant, float value) {











        final View.TransformationInfo info = mView.mTransformationInfo;














        final RenderNode renderNode = mView.mRenderNode;







        final RenderNode renderNode = mView.mRenderNode;











        switch (propertyConstant) {







        switch (propertyConstant) {











            case TRANSLATION_X:







            case TRANSLATION_X:










@@ -1009,7 +1008,7 @@ public class ViewPropertyAnimator {









                renderNode.setTranslationZ(value - renderNode.getElevation());







                renderNode.setTranslationZ(value - renderNode.getElevation());











                break;







                break;











            case ALPHA:







            case ALPHA:











                info.mAlpha = value;







                mView.setAlphaInternal(value);











                renderNode.setAlpha(value);







                renderNode.setAlpha(value);











                break;







                break;











        }







        }










@@ -1047,7 +1046,7 @@ public class ViewPropertyAnimator {









            case Z:







            case Z:











                return node.getElevation() + node.getTranslationZ();







                return node.getElevation() + node.getTranslationZ();











            case ALPHA:







            case ALPHA:











                return mView.mTransformationInfo.mAlpha;







                return mView.getAlpha();











        }







        }











        return 0;







        return 0;











    }







    }