Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make measureText(String, int, int) not use context" into mnc-dev

Browse Source
This commit is contained in:
Raph Levien
2015-06-24 21:12:33 +00:00
committed by Android (Google) Code Review
parent 1af5fe2308 1149cdc84b
commit 420cf23676
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/Paint.cpp
View File

@@ -606,7 +606,9 @@ public:
Layout layout; Layout layout;
TypefaceImpl* typeface = getNativeTypeface(env, jpaint); TypefaceImpl* typeface = getNativeTypeface(env, jpaint);
MinikinUtils::doLayout(&layout, paint, bidiFlags, typeface, textArray, start, count, textLength); // Only the substring is used for measurement, so no additional context is passed in. This
// behavior is consistent between char[] and String specializations.
MinikinUtils::doLayout(&layout, paint, bidiFlags, typeface, textArray + start, 0, count, count);
width = layout.getAdvance(); width = layout.getAdvance();
env->ReleaseStringChars(text, textArray); env->ReleaseStringChars(text, textArray);