diff options
| author | Eric Fischer <> | 2009-03-27 18:04:12 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 18:04:12 -0700 |
| commit | 423f0e4205e3c49c6a87b389fa6025772aa7010c (patch) | |
| tree | aafe5001aa0397dd0e39b60b6186ed22f168449b /core/java/android/text/StaticLayout.java | |
| parent | 94befd1be9b3a19fb2dda8badebb373806cb311c (diff) | |
AI 143314: am: CL 143165 am: CL 142861 Make TextView Emoji scale to match the size of the text.
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143314
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 720d15aa5980..686e8f5327e8 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -567,7 +567,19 @@ extends Layout getBitmapFromAndroidPua(emoji); if (bm != null) { - w += bm.getWidth(); + Paint whichPaint; + + if (spanned == null) { + whichPaint = paint; + } else { + whichPaint = mWorkPaint; + } + + float wid = (float) bm.getWidth() * + -whichPaint.ascent() / + bm.getHeight(); + + w += wid; tab = true; j++; } else { |