drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return a copy of the read-only identity Matrix"

Browse Source
This commit is contained in:
Romain Guy
2013-01-31 00:27:55 +00:00
committed by Android (Google) Code Review
parent afae9d248a 5370405db2
commit 984add522e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/ImageView.java
View File

@ -562,13 +562,14 @@ public class ImageView extends View {
/** Return the view's optional matrix. This is applied to the /** Return the view's optional matrix. This is applied to the
view's drawable when it is drawn. If there is not matrix, view's drawable when it is drawn. If there is not matrix,
this method will return null. this method will return an identity matrix.
Do not change this matrix in place. If you want a different matrix Do not change this matrix in place but make a copy.
applied to the drawable, be sure to call setImageMatrix(). If you want a different matrix applied to the drawable,
be sure to call setImageMatrix().
*/ */
public Matrix getImageMatrix() { public Matrix getImageMatrix() {
if (mDrawMatrix == null) { if (mDrawMatrix == null) {
return Matrix.IDENTITY_MATRIX; return new Matrix(Matrix.IDENTITY_MATRIX);
} }
return mDrawMatrix; return mDrawMatrix;
} }