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

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java
index 2c78679237f6..2f9852d6a816 100644
--- a/core/java/android/text/DynamicLayout.java
+++ b/core/java/android/text/DynamicLayout.java
@@ -275,7 +275,7 @@ extends Layout
         }
 
         if (reflowed == null) {
-            reflowed = new StaticLayout(true);
+            reflowed = new StaticLayout(getText());
         } else {
             reflowed.prepare();
         }
@@ -488,7 +488,8 @@ extends Layout
 
     private int mTopPadding, mBottomPadding;
 
-    private static StaticLayout sStaticLayout = new StaticLayout(true);
+    private static StaticLayout sStaticLayout = null;
+
     private static final Object[] sLock = new Object[0];
 
     private static final int START = 0;