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

Commit c127cbe7 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Make View#transformMatrixToLocal/Global public 

These methods are being reflected into and seem generally useful
to developers.

Bug: 117521349
Bug: 117521191
Test: new CTS in topic
Change-Id: I86e8a379e458aefe7fb2fe936b57eeeffa5ad42d
parent ce7357ad

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -49315,6 +49315,8 @@ package android.view { 
    method public final boolean startDragAndDrop(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);

    method public boolean startNestedScroll(int);

    method public void stopNestedScroll();

    method public void transformMatrixToGlobal(android.graphics.Matrix);

    method public void transformMatrixToLocal(android.graphics.Matrix);

    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);

    method public void unscheduleDrawable(android.graphics.drawable.Drawable);

    method public final void updateDragShadow(android.view.View.DragShadowBuilder);

core/java/android/view/View.java

+16 −20
Original line number Diff line number Diff line
@@ -23157,26 +23157,24 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * Modifies the input matrix such that it maps view-local coordinates to

     * on-screen coordinates.

     *

     * @param m input matrix to modify

     * @hide

     * @param matrix input matrix to modify

     */

    @UnsupportedAppUsage

    public void transformMatrixToGlobal(Matrix m) {

    public void transformMatrixToGlobal(Matrix matrix) {

        final ViewParent parent = mParent;

        if (parent instanceof View) {

            final View vp = (View) parent;

            vp.transformMatrixToGlobal(m);

            m.preTranslate(-vp.mScrollX, -vp.mScrollY);

            vp.transformMatrixToGlobal(matrix);

            matrix.preTranslate(-vp.mScrollX, -vp.mScrollY);

        } else if (parent instanceof ViewRootImpl) {

            final ViewRootImpl vr = (ViewRootImpl) parent;

            vr.transformMatrixToGlobal(m);

            m.preTranslate(0, -vr.mCurScrollY);

            vr.transformMatrixToGlobal(matrix);

            matrix.preTranslate(0, -vr.mCurScrollY);

        }













        m.preTranslate(mLeft, mTop);













        matrix.preTranslate(mLeft, mTop);





























        if (!hasIdentityMatrix()) {













            m.preConcat(getMatrix());













            matrix.preConcat(getMatrix());















        }















    }























@@ -23184,26 +23182,24 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * Modifies the input matrix such that it maps on-screen coordinates to















     * view-local coordinates.















     *













     * @param m input matrix to modify













     * @hide













     * @param matrix input matrix to modify















     */













    @UnsupportedAppUsage













    public void transformMatrixToLocal(Matrix m) {













    public void transformMatrixToLocal(Matrix matrix) {















        final ViewParent parent = mParent;















        if (parent instanceof View) {















            final View vp = (View) parent;













            vp.transformMatrixToLocal(m);













            m.postTranslate(vp.mScrollX, vp.mScrollY);













            vp.transformMatrixToLocal(matrix);













            matrix.postTranslate(vp.mScrollX, vp.mScrollY);















        } else if (parent instanceof ViewRootImpl) {















            final ViewRootImpl vr = (ViewRootImpl) parent;













            vr.transformMatrixToLocal(m);













            m.postTranslate(0, vr.mCurScrollY);













            vr.transformMatrixToLocal(matrix);













            matrix.postTranslate(0, vr.mCurScrollY);















        }



























        m.postTranslate(-mLeft, -mTop);













        matrix.postTranslate(-mLeft, -mTop);





























        if (!hasIdentityMatrix()) {













            m.postConcat(getInverseMatrix());













            matrix.postConcat(getInverseMatrix());















        }















    }