Merge "Use TextDirectionHeuristics to detect text direction in Html" (ff53f923) · Commits · e / os / android_frameworks_base

core/java/android/text/Html.java

+4 −15

Original line number	Diff line number	Diff line
		@@ -40,8 +40,6 @@ import android.text.style.TypefaceSpan;
		import android.text.style.URLSpan;
		import android.text.style.UnderlineSpan;

		import com.android.internal.util.ArrayUtils;

		import org.ccil.cowan.tagsoup.HTMLSchema;
		import org.ccil.cowan.tagsoup.Parser;
		import org.xml.sax.Attributes;
		@@ -342,18 +340,9 @@ public class Html {
		}

		private static String getTextDirection(Spanned text, int start, int end) {
		final int len = end - start;
		final byte[] levels = ArrayUtils.newUnpaddedByteArray(len);
		final char[] buffer = TextUtils.obtain(len);
		TextUtils.getChars(text, start, end, buffer, 0);

		int paraDir = AndroidBidi.bidi(Layout.DIR_REQUEST_DEFAULT_LTR, buffer, levels, len,
		false /* no info */);
		switch(paraDir) {
		case Layout.DIR_RIGHT_TO_LEFT:
		if (TextDirectionHeuristics.FIRSTSTRONG_LTR.isRtl(text, start, end - start)) {
		return " dir=\"rtl\"";
		case Layout.DIR_LEFT_TO_RIGHT:
		default:
		} else {
		return " dir=\"ltr\"";
		}
		}