summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2011-03-04 09:32:14 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-04 09:32:14 -0800
commit91ac3dc06d1b99c5e63cda3b5ae0adfec406fd7a (patch)
tree17947c40010a5d9c962e5104990b269af502d849
parent6e38d26c1e66cc957c33d4263013e02623ebd6da (diff)
parente11ce83a96c61cf4f51ea62a32917e5814127516 (diff)
downloadframeworks_base-91ac3dc06d1b99c5e63cda3b5ae0adfec406fd7a.zip
frameworks_base-91ac3dc06d1b99c5e63cda3b5ae0adfec406fd7a.tar.gz
frameworks_base-91ac3dc06d1b99c5e63cda3b5ae0adfec406fd7a.tar.bz2
Merge "Use the same width as the TextView created layout." into honeycomb-mr1
-rw-r--r--core/java/android/webkit/WebTextView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 47c69be..28b0951 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -415,7 +415,7 @@ import junit.framework.Assert;
}
CharSequence text = getText();
// Copy from the existing Layout.
- mLayout = new WebTextViewLayout(text, text, getPaint(), w,
+ mLayout = new WebTextViewLayout(text, text, getPaint(), mLayout.getWidth(),
mLayout.getAlignment(), mLayout.getSpacingMultiplier(),
mLayout.getSpacingAdd(), false, null, ellipsisWidth,
lineHeight);