diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 36 |
2 files changed, 18 insertions, 20 deletions
diff --git a/api/current.txt b/api/current.txt index abd3c312e7e6..b177494ca369 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f19d40ab46c3..fe7f2200d234 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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()); } } |