Change maxLines and ellipsis argument from nullable to non-null
There is no merge concept in Paragraphs, so just set the reasonable
default value for these arguments.
Bug: 139319934
Test: TreeHuger
Change-Id: I46dac259bcd950ec5c66ecd79c4acac2675b68ba
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt
index f2cc10b..c752feeb 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt
@@ -1255,7 +1255,7 @@
text: String,
fontSize: TextUnit = TextUnit.Inherit,
paragraphStyle: ParagraphStyle = ParagraphStyle(),
- maxLines: Int? = null,
+ maxLines: Int = Int.MAX_VALUE,
width: Float = Float.MAX_VALUE
): MultiParagraph {
return MultiParagraph(
@@ -1279,7 +1279,7 @@
text: AnnotatedString,
fontSize: TextUnit = TextUnit.Inherit,
paragraphStyle: ParagraphStyle = ParagraphStyle(),
- maxLines: Int? = null,
+ maxLines: Int = Int.MAX_VALUE,
width: Float = Float.MAX_VALUE
): MultiParagraph {
return MultiParagraph(
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt
index 786341b..972da82 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt
@@ -3174,7 +3174,7 @@
textIndent: TextIndent? = null,
textAlign: TextAlign? = null,
fontSize: TextUnit = TextUnit.Inherit,
- maxLines: Int? = null,
+ maxLines: Int = Int.MAX_VALUE,
lineHeight: TextUnit = TextUnit.Inherit,
spanStyles: List<AnnotatedString.Item<SpanStyle>> = listOf(),
fontFamily: FontFamily = fontFamilyMeasureFont,
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
index cf1bf64..845d771 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
@@ -1187,8 +1187,8 @@
textIndent: TextIndent? = null,
textAlign: TextAlign? = null,
textDirectionAlgorithm: TextDirectionAlgorithm? = TextDirectionAlgorithm.ContentOrLtr,
- ellipsis: Boolean? = null,
- maxLines: Int? = null,
+ ellipsis: Boolean = false,
+ maxLines: Int = Int.MAX_VALUE,
constraints: ParagraphConstraints,
textStyle: TextStyle? = null,
typefaceAdapter: TypefaceAdapter = TypefaceAdapter()