summaryrefslogtreecommitdiff
path: root/core/java/android/text/Layout.java
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2017-08-21 12:53:44 -0700
committerRoozbeh Pournader <roozbeh@google.com>2017-08-23 15:05:06 -0700
commit22a167cac8f585ffd3ca73e40b82a26c1e09df11 (patch)
tree281f4aadde5dd8ef4a0c557a623e6e50ac7d8458 /core/java/android/text/Layout.java
parent3a58025684a8c379d64bd9968f6549bb11efe753 (diff)
Add a builder for DynamicLayout and switch TextView to it
The builder mostly copies the structure and the logic of StaticLayout. We also improve various parts of code and documentation in StaticLayout's builder. Bug: 28963299 Test: bit FrameworksCoreTests:android.text. Test: bit FrameworksCoreTests:android.widget.TextViewTest Test: bit CtsTextTestCases:* Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest Change-Id: I5c4a6e031bd0f41f765a3d85e0b9b7e9be42ad4b
Diffstat (limited to 'core/java/android/text/Layout.java')
-rw-r--r--core/java/android/text/Layout.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 5d9c8d88fd1b..04dadc8eb0f4 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -119,6 +119,16 @@ public abstract class Layout {
*/
public static final int JUSTIFICATION_MODE_INTER_WORD = 1;
+ /*
+ * Line spacing multiplier for default line spacing.
+ */
+ public static final float DEFAULT_LINESPACING_MULTIPLIER = 1.0f;
+
+ /*
+ * Line spacing addition for default line spacing.
+ */
+ public static final float DEFAULT_LINESPACING_ADDITION = 0.0f;
+
/**
* Return how wide a layout must be in order to display the specified text with one line per
* paragraph.