diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-09 13:54:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-09 13:54:43 -0700 |
| commit | 61ccc6a203e1b0fb235a4eed2b40e0c080f57f0c (patch) | |
| tree | 89cabe1cc192c1a8d15930d16640c009e8cc04af /core/java/android/text/TextLine.java | |
| parent | 0419a2a9b5301b78d4c1c57fa671d467c1915269 (diff) | |
| parent | 6ab90ed017fb52aac4493a2fac897299d345874f (diff) | |
Merge changes I46744e51,I1f566cce
* changes:
Solidify and optimize Paint text related APIs
Add more optimizations for Text measuring / breaking / getting advances
Diffstat (limited to 'core/java/android/text/TextLine.java')
| -rw-r--r-- | core/java/android/text/TextLine.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index c114c371a50a..3e5f32e7d5e1 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -828,7 +828,10 @@ class TextLine { if (start == measureLimit) { TextPaint wp = mWorkPaint; wp.set(mPaint); - return handleText(wp, 0, 0, 0, 0, runIsRtl, c, x, top, y, bottom, fmi, needWidth); + if (fmi != null) { + expandMetricsFromPaint(fmi, wp); + } + return 0f; } // Shaping needs to take into account context up to metric boundaries, |