diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-10 16:31:58 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-15 13:18:34 -0700 |
| commit | 8059e0903e36cbb5cf8b5c5d5d653acc9bbc8402 (patch) | |
| tree | fba90001b825ca2d8c7102659d915b02caa3b7b9 /core/java/android/text/TextLine.java | |
| parent | b2a85b69ce98a312c450849dfd18bd1f878b5d66 (diff) | |
| download | frameworks_base-8059e0903e36cbb5cf8b5c5d5d653acc9bbc8402.zip frameworks_base-8059e0903e36cbb5cf8b5c5d5d653acc9bbc8402.tar.gz frameworks_base-8059e0903e36cbb5cf8b5c5d5d653acc9bbc8402.tar.bz2 | |
Fix bug #3388534 Long file names are improperly displayed when played
- force ellipsising when there are more lines found than maxLines
- do not care about lines when we have reached maxLines
- also fix relayouting when changing maxLines thru setMaxLines()
- do not allow START / MIDDLE ellipsis when there are multiple lines
(and print a log accordingly)
Change-Id: I90f5a7f5200a220aceee01fb7300bec2c4c3a075
Diffstat (limited to 'core/java/android/text/TextLine.java')
| -rw-r--r-- | core/java/android/text/TextLine.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 376e4f5..fcc372e 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -125,6 +125,9 @@ class TextLine { mLen = limit - start; mDir = dir; mDirections = directions; + if (mDirections == null) { + throw new IllegalArgumentException("Directions cannot be null"); + } mHasTabs = hasTabs; mSpanned = null; |