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

am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev

Browse Source 
* commit 'a08934cf54e3120d5019839a4b6d553b3364e8d1':
  Avoid static initialization of Layout from TextUtils
This commit is contained in:
Neil Fuller
2015-02-06 17:44:49 +00:00
committed by Android Git Automerger
parent b6332fd21a a08934cf54
commit 022cf57f82
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/text/Layout.java
View File

@@ -1754,8 +1754,8 @@ public abstract class Layout {
private char getEllipsisChar(TextUtils.TruncateAt method) { private char getEllipsisChar(TextUtils.TruncateAt method) {
return (method == TextUtils.TruncateAt.END_SMALL) ? return (method == TextUtils.TruncateAt.END_SMALL) ?
ELLIPSIS_TWO_DOTS[0] : TextUtils.ELLIPSIS_TWO_DOTS[0] :
ELLIPSIS_NORMAL[0]; TextUtils.ELLIPSIS_NORMAL[0];
} }
private void ellipsize(int start, int end, int line, private void ellipsize(int start, int end, int line,
@@ -1952,6 +1952,4 @@ public abstract class Layout {
/* package */ static final Directions DIRS_ALL_RIGHT_TO_LEFT = /* package */ static final Directions DIRS_ALL_RIGHT_TO_LEFT =
new Directions(new int[] { 0, RUN_LENGTH_MASK | RUN_RTL_FLAG }); new Directions(new int[] { 0, RUN_LENGTH_MASK | RUN_RTL_FLAG });
/* package */ static final char[] ELLIPSIS_NORMAL = { '\u2026' }; // this is "..."
/* package */ static final char[] ELLIPSIS_TWO_DOTS = { '\u2025' }; // this is ".."
} }

2
core/java/android/text/StaticLayout.java
View File

@@ -652,7 +652,7 @@ public class StaticLayout extends Layout {
float ellipsisWidth = paint.measureText( float ellipsisWidth = paint.measureText(
(where == TextUtils.TruncateAt.END_SMALL) ? (where == TextUtils.TruncateAt.END_SMALL) ?
ELLIPSIS_TWO_DOTS : ELLIPSIS_NORMAL, 0, 1); TextUtils.ELLIPSIS_TWO_DOTS : TextUtils.ELLIPSIS_NORMAL, 0, 1);
int ellipsisStart = 0; int ellipsisStart = 0;
int ellipsisCount = 0; int ellipsisCount = 0;
int len = lineEnd - lineStart; int len = lineEnd - lineStart;

9
core/java/android/text/TextUtils.java
View File

@@ -63,9 +63,12 @@ import java.util.regex.Pattern;
public class TextUtils { public class TextUtils {
private static final String TAG = "TextUtils"; private static final String TAG = "TextUtils";
private static final String ELLIPSIS = new String(Layout.ELLIPSIS_NORMAL);
private static final String ELLIPSIS_TWO_DOTS = new String(Layout.ELLIPSIS_TWO_DOTS);
/* package */ static final char[] ELLIPSIS_NORMAL = { '\u2026' }; // this is "..."
private static final String ELLIPSIS_STRING = new String(ELLIPSIS_NORMAL);
/* package */ static final char[] ELLIPSIS_TWO_DOTS = { '\u2025' }; // this is ".."
private static final String ELLIPSIS_TWO_DOTS_STRING = new String(ELLIPSIS_TWO_DOTS);
private TextUtils() { /* cannot be instantiated */ } private TextUtils() { /* cannot be instantiated */ }
@@ -1085,7 +1088,7 @@ public class TextUtils {
EllipsizeCallback callback) { EllipsizeCallback callback) {
return ellipsize(text, paint, avail, where, preserveLength, callback, return ellipsize(text, paint, avail, where, preserveLength, callback,
TextDirectionHeuristics.FIRSTSTRONG_LTR, TextDirectionHeuristics.FIRSTSTRONG_LTR,
(where == TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS : ELLIPSIS); (where == TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS_STRING : ELLIPSIS_STRING);
} }
/** /**