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

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

Browse Source 
* commit '420cf236762db164ef8d37b336ee18ba84aab5b6':
  Make measureText(String, int, int) not use context
This commit is contained in:
Raph Levien
2015-06-24 21:23:17 +00:00
committed by Android Git Automerger
parent d1741ef961 420cf23676
commit 5645df2344
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;
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();
env->ReleaseStringChars(text, textArray);