Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev

Browse Source 
am: 886ad06

* commit '886ad0690bd3b4e7ee08f032432eefe53a2bdaa9':
  Clean up BoringLayout#isBoring() a little
This commit is contained in:
Roozbeh Pournader
2016-03-17 17:35:24 +00:00
committed by android-build-merger
parent 0130d6ec8f 886ad0690b
commit fcf435294c
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/java/android/text/BoringLayout.java
View File

@@ -247,23 +247,22 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
*/ */
public static Metrics isBoring(CharSequence text, TextPaint paint, public static Metrics isBoring(CharSequence text, TextPaint paint,
TextDirectionHeuristic textDir, Metrics metrics) { TextDirectionHeuristic textDir, Metrics metrics) {
char[] temp = TextUtils.obtain(500); final int MAX_BUF_LEN = 500;
int length = text.length(); final char[] buffer = TextUtils.obtain(MAX_BUF_LEN);
final int textLength = text.length();
boolean boring = true; boolean boring = true;
outer: outer:
for (int i = 0; i < length; i += 500) { for (int start = 0; start < textLength; start += MAX_BUF_LEN) {
int j = i + 500; final int end = Math.min(start + MAX_BUF_LEN, textLength);
if (j > length) // No need to worry about getting half codepoints, since we reject surrogate code units
j = length; // as non-boring as soon we see one.
TextUtils.getChars(text, start, end, buffer, 0);
TextUtils.getChars(text, i, j, temp, 0); final int len = end - start;
for (int i = 0; i < len; i++) {
int n = j - i; final char c = buffer[i];
for (int a = 0; a < n; a++) {
char c = temp[a];
if (c == '\n' || c == '\t' || if (c == '\n' || c == '\t' ||
(c >= 0x0590 && c <= 0x08FF) || // RTL scripts (c >= 0x0590 && c <= 0x08FF) || // RTL scripts
@@ -279,17 +278,19 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
} }
} }
if (textDir != null && textDir.isRtl(temp, 0, n)) { // TODO: This looks a little suspicious, and in some cases can result in O(n^2)
// run time. Consider moving outside the loop.
if (textDir != null && textDir.isRtl(buffer, 0, len)) {
boring = false; boring = false;
break outer; break outer;
} }
} }
TextUtils.recycle(temp); TextUtils.recycle(buffer);
if (boring && text instanceof Spanned) { if (boring && text instanceof Spanned) {
Spanned sp = (Spanned) text; Spanned sp = (Spanned) text;
Object[] styles = sp.getSpans(0, length, ParagraphStyle.class); Object[] styles = sp.getSpans(0, textLength, ParagraphStyle.class);
if (styles.length > 0) { if (styles.length > 0) {
boring = false; boring = false;
} }
@@ -302,7 +303,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
} }
TextLine line = TextLine.obtain(); TextLine line = TextLine.obtain();
line.set(paint, text, 0, length, Layout.DIR_LEFT_TO_RIGHT, line.set(paint, text, 0, textLength, Layout.DIR_LEFT_TO_RIGHT,
Layout.DIRS_ALL_LEFT_TO_RIGHT, false, null); Layout.DIRS_ALL_LEFT_TO_RIGHT, false, null);
fm.width = (int) Math.ceil(line.metrics(fm)); fm.width = (int) Math.ceil(line.metrics(fm));
TextLine.recycle(line); TextLine.recycle(line);