diff options
| author | Neil Fuller <nfuller@google.com> | 2015-02-06 17:52:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-06 17:52:57 +0000 |
| commit | 0b1b82473d78b0887fe8b22d30812d0d2b7b6338 (patch) | |
| tree | 161155ab76c17c0762eacb3e078dc9b2e1df4649 /core/java/android/text | |
| parent | d22517a7084fd3a56f22490b405c002086dc14ac (diff) | |
| parent | c63efbd928cc14e32fe19b2dec41d15ffc584182 (diff) | |
| download | frameworks_base-0b1b82473d78b0887fe8b22d30812d0d2b7b6338.zip frameworks_base-0b1b82473d78b0887fe8b22d30812d0d2b7b6338.tar.gz frameworks_base-0b1b82473d78b0887fe8b22d30812d0d2b7b6338.tar.bz2 | |
am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
automerge: c63efbd
* commit 'c63efbd928cc14e32fe19b2dec41d15ffc584182':
Avoid static initialization of Layout from TextUtils
Diffstat (limited to 'core/java/android/text')
| -rw-r--r-- | core/java/android/text/Layout.java | 6 | ||||
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 2 | ||||
| -rw-r--r-- | core/java/android/text/TextUtils.java | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 2b53c48..b84c3aa 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -1754,8 +1754,8 @@ public abstract class Layout { private char getEllipsisChar(TextUtils.TruncateAt method) { return (method == TextUtils.TruncateAt.END_SMALL) ? - ELLIPSIS_TWO_DOTS[0] : - ELLIPSIS_NORMAL[0]; + TextUtils.ELLIPSIS_TWO_DOTS[0] : + TextUtils.ELLIPSIS_NORMAL[0]; } 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 = 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 ".." } diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 5b07397..2d4b4dc 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -554,7 +554,7 @@ public class StaticLayout extends Layout { float ellipsisWidth = paint.measureText( (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 ellipsisCount = 0; int len = lineEnd - lineStart; diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java index 8a8c6d8..48bb5dd 100644 --- a/core/java/android/text/TextUtils.java +++ b/core/java/android/text/TextUtils.java @@ -63,9 +63,12 @@ import java.util.regex.Pattern; public class 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 */ } @@ -1085,7 +1088,7 @@ public class TextUtils { EllipsizeCallback callback) { return ellipsize(text, paint, avail, where, preserveLength, callback, TextDirectionHeuristics.FIRSTSTRONG_LTR, - (where == TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS : ELLIPSIS); + (where == TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS_STRING : ELLIPSIS_STRING); } /** |