diff options
| author | Eric Fischer <enf@google.com> | 2009-09-01 11:18:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-01 11:18:43 -0700 |
| commit | b7559e02803266e5fa9f4496174bc343ecd245ab (patch) | |
| tree | 393e63d9f1f54cbc3eb89706cd35216707c33efd /core/java | |
| parent | 46c158234dee0d1d47f06b7661150c18512dc589 (diff) | |
| parent | 56205fea879543a50bb797016832416a8b48cabb (diff) | |
| download | frameworks_base-b7559e02803266e5fa9f4496174bc343ecd245ab.zip frameworks_base-b7559e02803266e5fa9f4496174bc343ecd245ab.tar.gz frameworks_base-b7559e02803266e5fa9f4496174bc343ecd245ab.tar.bz2 | |
am 56205fea: Merge change 23345 into donut
Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair
* commit '56205fea879543a50bb797016832416a8b48cabb':
Fix an emoji-measuring bug that caused an exception when editing a contact.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/text/Layout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 29dc2ea..a92800d 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -1527,7 +1527,7 @@ public abstract class Layout { if (bm != null) { workPaint.set(paint); Styled.measureText(paint, workPaint, text, - offset, offset + 1, null); + j, j + 2, null); float wid = (float) bm.getWidth() * -workPaint.ascent() / bm.getHeight(); |