Merge "Resize all LineBreakers arrays when needed" into qt-dev

2 files changed, 43 insertions, 0 deletions

diff --git a/bridge/tests/res/testApp/MyApplication/golden/many_line_breaks.png b/bridge/tests/res/testApp/MyApplication/golden/many_line_breaks.png
new file mode 100644
index 0000000000..5800b241b8
--- /dev/null
+++ b/bridge/tests/res/testApp/MyApplication/golden/many_line_breaks.png
diff --git a/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java b/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
index 27560d958a..aca520c779 100644
--- a/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
+++ b/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
@@ -1574,4 +1574,47 @@ public class RenderTests extends RenderTestBase {
                 TimeUnit.SECONDS.toNanos(2));
     }
 
+    @Test
+    public void testManyLineBreaks() throws Exception {
+        String layout =
+                "<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n" +
+                        "              android:layout_width=\"match_parent\"\n" +
+                        "              android:layout_height=\"match_parent\">\n" + "\n" +
+                        "    <EditText\n" +
+                        "        android:layout_width=\"match_parent\"\n" +
+                        "        android:layout_height=\"wrap_content\"\n" +
+                        "        android:fallbackLineSpacing=\"true\"\n" +
+                        "        android:text=\"A very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very very very very very very very very " +
+                        "very very very very very very very long text\"/>\n" +
+                        "</FrameLayout>";
+
+        LayoutPullParser parser = LayoutPullParser.createFromString(layout);
+        // Create LayoutLibCallback.
+        LayoutLibTestCallback layoutLibCallback =
+                new LayoutLibTestCallback(getLogger(), mDefaultClassLoader);
+        layoutLibCallback.initResources();
+
+        SessionParams params = getSessionParamsBuilder()
+                .setParser(parser)
+                .setCallback(layoutLibCallback)
+                .setTheme("Theme.Material.NoActionBar.Fullscreen", false)
+                .setRenderingMode(RenderingMode.V_SCROLL)
+                .disableDecoration()
+                .build();
+
+        renderAndVerify(params, "many_line_breaks.png",
+                TimeUnit.SECONDS.toNanos(2));
+    }
+
 }