Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev

2014-04-24 16:12:54 +00:00
parent e597d5f931 936df68016
commit e4ee0e3193
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -654,7 +654,7 @@ public class StaticLayout extends Layout {

        int extra;

-        if (needMultiply) {
+        if (needMultiply && end != bufEnd) {
            double ex = (below - above) * (spacingmult - 1) + spacingadd;
            if (ex >= 0) {
                extra = (int)(ex + EXTRA_ROUNDING);