diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-04-22 16:54:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-22 16:54:37 -0700 |
| commit | 3f92b8b18856371f561955197b488191433977e6 (patch) | |
| tree | e8b68641398f834697ec698eeae79420653ccd66 /core/java | |
| parent | 6c079b6819d749fcb72988c5b06becff081c82fd (diff) | |
| parent | 0a1413e4bf9dcda2a8abb2287e43f612a7fb2453 (diff) | |
| download | frameworks_base-3f92b8b18856371f561955197b488191433977e6.zip frameworks_base-3f92b8b18856371f561955197b488191433977e6.tar.gz frameworks_base-3f92b8b18856371f561955197b488191433977e6.tar.bz2 | |
Merge "Clean getTextRunAdvances() APIs"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/text/GraphicsOperations.java | 4 | ||||
| -rw-r--r-- | core/java/android/text/SpannableStringBuilder.java | 16 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/core/java/android/text/GraphicsOperations.java b/core/java/android/text/GraphicsOperations.java index 6e2168b..831ccc5 100644 --- a/core/java/android/text/GraphicsOperations.java +++ b/core/java/android/text/GraphicsOperations.java @@ -61,8 +61,8 @@ extends CharSequence * Just like {@link Paint#getTextRunAdvances}. * @hide */ - float getTextRunAdvancesICU(int start, int end, int contextStart, int contextEnd, - int flags, float[] advances, int advancesIndex, Paint paint); + float getTextRunAdvances(int start, int end, int contextStart, int contextEnd, + int flags, float[] advances, int advancesIndex, Paint paint, int reserved); /** * Just like {@link Paint#getTextRunCursor}. diff --git a/core/java/android/text/SpannableStringBuilder.java b/core/java/android/text/SpannableStringBuilder.java index ff6a4cd..6b2d8e4 100644 --- a/core/java/android/text/SpannableStringBuilder.java +++ b/core/java/android/text/SpannableStringBuilder.java @@ -1173,8 +1173,8 @@ implements CharSequence, GetChars, Spannable, Editable, Appendable, * Don't call this yourself -- exists for Paint to use internally. * {@hide} */ - public float getTextRunAdvancesICU(int start, int end, int contextStart, int contextEnd, int flags, - float[] advances, int advancesPos, Paint p) { + public float getTextRunAdvances(int start, int end, int contextStart, int contextEnd, int flags, + float[] advances, int advancesPos, Paint p, int reserved) { float ret; @@ -1182,16 +1182,16 @@ implements CharSequence, GetChars, Spannable, Editable, Appendable, int len = end - start; if (end <= mGapStart) { - ret = p.getTextRunAdvancesICU(mText, start, len, contextStart, contextLen, - flags, advances, advancesPos); + ret = p.getTextRunAdvances(mText, start, len, contextStart, contextLen, + flags, advances, advancesPos, reserved); } else if (start >= mGapStart) { - ret = p.getTextRunAdvancesICU(mText, start + mGapLength, len, - contextStart + mGapLength, contextLen, flags, advances, advancesPos); + ret = p.getTextRunAdvances(mText, start + mGapLength, len, + contextStart + mGapLength, contextLen, flags, advances, advancesPos, reserved); } else { char[] buf = TextUtils.obtain(contextLen); getChars(contextStart, contextEnd, buf, 0); - ret = p.getTextRunAdvancesICU(buf, start - contextStart, len, - 0, contextLen, flags, advances, advancesPos); + ret = p.getTextRunAdvances(buf, start - contextStart, len, + 0, contextLen, flags, advances, advancesPos, reserved); TextUtils.recycle(buf); } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 83f3c6b..4d3aa68 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -2967,14 +2967,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener advancesIndex); } - public float getTextRunAdvancesICU(int start, int end, int contextStart, + public float getTextRunAdvances(int start, int end, int contextStart, int contextEnd, int flags, float[] advances, int advancesIndex, - Paint p) { + Paint p, int reserved) { int count = end - start; int contextCount = contextEnd - contextStart; - return p.getTextRunAdvancesICU(mChars, start + mStart, count, + return p.getTextRunAdvances(mChars, start + mStart, count, contextStart + mStart, contextCount, flags, advances, - advancesIndex); + advancesIndex, reserved); } public int getTextRunCursor(int contextStart, int contextEnd, int flags, |