From f4babd73dc4045b699748fbe3ae4e9b02aefe002 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Tue, 29 Sep 2020 18:58:41 -0700 Subject: [PATCH] Address API Council Feedback to android.graphics.fonts.Font Bug: 169640906 Test: N/A Change-Id: If5ef79f6a692a09f1464c65b55844742413526de --- .../java/android/graphics/fonts/Font.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/graphics/java/android/graphics/fonts/Font.java b/graphics/java/android/graphics/fonts/Font.java index 2a52ce962c833..e1a17957ebd74 100644 --- a/graphics/java/android/graphics/fonts/Font.java +++ b/graphics/java/android/graphics/fonts/Font.java @@ -591,14 +591,14 @@ public final class Font { * * @param glyphId a glyph ID * @param paint a paint object used for resolving glyph style - * @param rect a nullable destination object. If null is passed, this function just return the - * horizontal advance. If non-null is passed, this function fills bounding box - * information to this object. + * @param outBoundingBox a nullable destination object. If null is passed, this function just + * return the horizontal advance. If non-null is passed, this function + * fills bounding box information to this object. * @return the amount of horizontal advance in pixels */ public float getGlyphBounds(@IntRange(from = 0) int glyphId, @NonNull Paint paint, - @Nullable RectF rect) { - return nGetGlyphBounds(mNativePtr, glyphId, paint.getNativeInstance(), rect); + @Nullable RectF outBoundingBox) { + return nGetGlyphBounds(mNativePtr, glyphId, paint.getNativeInstance(), outBoundingBox); } /** @@ -607,15 +607,15 @@ public final class Font { * Note that {@link android.graphics.Typeface} in {@link android.graphics.Paint} is ignored. * * @param paint a paint object used for retrieving font metrics. - * @param metrics a nullable destination object. If null is passed, this function only retrieve - * recommended interline spacing. If non-null is passed, this function fills to - * font metrics to it. + * @param outMetrics a nullable destination object. If null is passed, this function only + * retrieve recommended interline spacing. If non-null is passed, this function + * fills to font metrics to it. * * @see Paint#getFontMetrics() * @see Paint#getFontMetricsInt() */ - public void getMetrics(@NonNull Paint paint, @Nullable Paint.FontMetrics metrics) { - nGetFontMetrics(mNativePtr, paint.getNativeInstance(), metrics); + public void getMetrics(@NonNull Paint paint, @Nullable Paint.FontMetrics outMetrics) { + nGetFontMetrics(mNativePtr, paint.getNativeInstance(), outMetrics); } /** @hide */