diff options
| -rw-r--r-- | core/java/android/widget/TextView.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index ef2d83b0e6e5..55e49ea067f8 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6081,18 +6081,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener int physicalWidth = width; if (mHorizontallyScrolling) { - width = getTextWidth(); + width = VERY_WIDE; } makeNewLayout(width, physicalWidth, UNKNOWN_BORING, UNKNOWN_BORING, physicalWidth, false); } - private int getTextWidth() { - final int length = mText.length(); - return (length == 0) ? 0 : (int) (getPaint().measureText(mText, 0, length) + 0.5f); - } - @Override protected void resetResolvedLayoutDirection() { super.resetResolvedLayoutDirection(); @@ -6538,7 +6533,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener int want = width - getCompoundPaddingLeft() - getCompoundPaddingRight(); int unpaddedWidth = want; - if (mHorizontallyScrolling) want = getTextWidth(); + if (mHorizontallyScrolling) want = VERY_WIDE; int hintWant = want; int hintWidth = (mHintLayout == null) ? hintWant : mHintLayout.getWidth(); @@ -11596,6 +11591,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private boolean mHighlightPathBogus = true; private static final RectF sTempRect = new RectF(); + // XXX should be much larger + private static final int VERY_WIDE = 1024*1024; + private static final int BLINK = 500; private static final int ANIMATED_SCROLL_GAP = 250; |