Merge "Fix getLineExtent for hyphen width." (d837ed2c) · Commits · e / os / android_frameworks_base

core/java/android/text/Layout.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1092,8 +1092,10 @@ public abstract class Layout {
		int dir = getParagraphDirection(line);

		TextLine tl = TextLine.obtain();
		mPaint.setHyphenEdit(getHyphen(line));
		tl.set(mPaint, mText, start, end, dir, directions, hasTabs, tabStops);
		float width = tl.metrics(null);
		mPaint.setHyphenEdit(0);
		TextLine.recycle(tl);
		return width;
		}
		@@ -1114,8 +1116,10 @@ public abstract class Layout {
		int dir = getParagraphDirection(line);

		TextLine tl = TextLine.obtain();
		mPaint.setHyphenEdit(getHyphen(line));
		tl.set(mPaint, mText, start, end, dir, directions, hasTabs, tabStops);
		float width = tl.metrics(null);
		mPaint.setHyphenEdit(0);
		TextLine.recycle(tl);
		return width;
		}

core/tests/coretests/src/android/widget/TextViewTest.java

+56 −0

Original line number	Diff line number	Diff line
		@@ -18,17 +18,23 @@ package android.widget;

		import android.app.Activity;
		import android.content.Intent;
		import android.graphics.Paint;
		import android.platform.test.annotations.Presubmit;
		import android.test.ActivityInstrumentationTestCase2;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.text.GetChars;
		import android.text.Layout;
		import android.text.Selection;
		import android.text.Spannable;
		import android.util.Log;
		import android.view.View;
		import java.util.Locale;

		/**
		* TextViewTest tests {@link TextView}.
		*/
		public class TextViewTest extends ActivityInstrumentationTestCase2<TextViewActivity> {
		private static final String TAG = "TextViewTest";
		private TextView mTextView;

		public TextViewTest() {
		@@ -169,4 +175,54 @@ public class TextViewTest extends ActivityInstrumentationTestCase2<TextViewActiv

		assertEquals(originalText, mTextView.getText().toString());
		}

		@SmallTest
		public void testHyphenationWidth() {
		TextView textView = new TextView(getActivity());
		textView.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
		textView.setTextLocale(Locale.US);

		Paint paint = textView.getPaint();

		String word = "thisissuperlonglongword";
		float wordWidth = paint.measureText(word, 0, word.length());

		StringBuilder sb = new StringBuilder();
		for (int i = 0; i < 100; ++i) {
		sb.append(word);
		sb.append(" ");
		}
		textView.setText(sb.toString());

		int width = (int)(wordWidth * 0.7);
		int height = 4096; // enough for all text.

		textView.measure(
		View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
		View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY));
		textView.layout(0, 0, width, height);

		Layout layout = textView.getLayout();
		assertNotNull(layout);

		int lineCount = layout.getLineCount();
		boolean hyphenationHappend = false;
		for (int i = 0; i < lineCount; ++i) {
		if (layout.getHyphen(i) != 1) {
		continue; // Hyphantion does not happen.
		}
		hyphenationHappend = true;

		int start = layout.getLineStart(i);
		int end = layout.getLineEnd(i);

		float withoutHyphenLength = paint.measureText(sb, start, end);
		float withHyphenLength = layout.getLineWidth(i);

		assertTrue("LineWidth should take account of hyphen length.",
		withHyphenLength > withoutHyphenLength);
		}
		assertTrue("Hyphenation must happen on TextView narrower than the word width",
		hyphenationHappend);
		}
		}