diff options
| author | 2024-02-28 20:07:48 +0000 | |
|---|---|---|
| committer | 2024-03-05 17:55:25 +0000 | |
| commit | a66abab50ce1eab7c91b5d3a9750966f0e85f98e (patch) | |
| tree | e398c451d18ad6d24baeecc6abf11c3d9ff7f52c | |
| parent | 3da1c92644c025a236770f37aaa3450402cb8d34 (diff) | |
fix javadocs for get/set Matrix44
Test: none
Bug:326419633
Change-Id: Ice4df6676dafc1e0e1bbc27dd587506c374432cc
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Matrix44.java | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index e8eace1c51c8..e328d8457ec9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -16363,7 +16363,7 @@ package android.graphics { ctor @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public Matrix44(); ctor @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public Matrix44(@NonNull android.graphics.Matrix); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") @NonNull public android.graphics.Matrix44 concat(@NonNull android.graphics.Matrix44); - method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public float get(int, int); + method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public float get(@IntRange(from=0, to=3) int, @IntRange(from=0, to=3) int); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public void getValues(@NonNull float[]); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public boolean invert(); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public boolean isIdentity(); @@ -16372,7 +16372,7 @@ package android.graphics { method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public void reset(); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") @NonNull public android.graphics.Matrix44 rotate(float, float, float, float); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") @NonNull public android.graphics.Matrix44 scale(float, float, float); - method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public void set(int, int, float); + method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public void set(@IntRange(from=0, to=3) int, @IntRange(from=0, to=3) int, float); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public void setValues(@NonNull float[]); method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") @NonNull public android.graphics.Matrix44 translate(float, float, float); } diff --git a/graphics/java/android/graphics/Matrix44.java b/graphics/java/android/graphics/Matrix44.java index 7cc0eb7a6728..a99e20101c3b 100644 --- a/graphics/java/android/graphics/Matrix44.java +++ b/graphics/java/android/graphics/Matrix44.java @@ -17,6 +17,7 @@ package android.graphics; import android.annotation.FlaggedApi; +import android.annotation.IntRange; import android.annotation.NonNull; import com.android.graphics.hwui.flags.Flags; @@ -98,11 +99,11 @@ public class Matrix44 { /** * Gets the value at the matrix's row and column. * - * @param row An integer from 0 to 4 indicating the row of the value to get - * @param col An integer from 0 to 4 indicating the column of the value to get + * @param row An integer from 0 to 3 indicating the row of the value to get + * @param col An integer from 0 to 3 indicating the column of the value to get */ @FlaggedApi(Flags.FLAG_MATRIX_44) - public float get(int row, int col) { + public float get(@IntRange(from = 0, to = 3) int row, @IntRange(from = 0, to = 3) int col) { if (row >= 0 && row < 4 && col >= 0 && col < 4) { return mBackingArray[row * 4 + col]; } @@ -112,12 +113,13 @@ public class Matrix44 { /** * Sets the value at the matrix's row and column to the provided value. * - * @param row An integer from 0 to 4 indicating the row of the value to change - * @param col An integer from 0 to 4 indicating the column of the value to change + * @param row An integer from 0 to 3 indicating the row of the value to change + * @param col An integer from 0 to 3 indicating the column of the value to change * @param val The value the element at the specified index will be set to */ @FlaggedApi(Flags.FLAG_MATRIX_44) - public void set(int row, int col, float val) { + public void set(@IntRange(from = 0, to = 3) int row, @IntRange(from = 0, to = 3) int col, + float val) { if (row >= 0 && row < 4 && col >= 0 && col < 4) { mBackingArray[row * 4 + col] = val; } else { |