Remove TODOs
Removed TODOs and created bugs instead:
b/139320235
b/143717890
b/143716498
b/143718074
b/140341380
Bug: 141645236
Test: ./gradlew test
Change-Id: I3ff945807d22ce85f1fa216c922afd5dfa48bc80
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutTest.kt
index f7b8706..1d3e64e 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutTest.kt
@@ -58,8 +58,6 @@
assertThat(frameworkLayout.getParagraphDirection(0)).isEqualTo(Layout.DIR_LEFT_TO_RIGHT)
assertThat(frameworkLayout.spacingMultiplier).isEqualTo(1.0f)
assertThat(frameworkLayout.spacingAdd).isEqualTo(0.0f)
- // TODO(haoyuchang): Need public API to test includePadding, maxLines,
- // breakStrategy and hyphenFrequency.
}
@Test
diff --git a/ui/ui-android-text/src/main/java/androidx/text/LayoutIntrinsics.kt b/ui/ui-android-text/src/main/java/androidx/text/LayoutIntrinsics.kt
index 48f35dd..8337726 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/LayoutIntrinsics.kt
+++ b/ui/ui-android-text/src/main/java/androidx/text/LayoutIntrinsics.kt
@@ -57,9 +57,6 @@
* of text where no soft line breaks are applied.
*/
val maxIntrinsicWidth: Float by lazy {
- // TODO(haoyuchang): we didn't pass the TextDirection to Layout.getDesiredWidth(), check if
- // there is any behavior difference from
- // Layout.getWidthWithLimits(charSequence, start, end, paint, dir)
boringMetrics?.width?.toFloat()
?: Layout.getDesiredWidth(charSequence, 0, charSequence.length, textPaint)
}
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/MultiParagraph.kt b/ui/ui-text/src/main/java/androidx/ui/text/MultiParagraph.kt
index dce606d..8ed2029 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/MultiParagraph.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/MultiParagraph.kt
@@ -177,8 +177,6 @@
paragraphInfo.bottom = (currentHeight + paragraph.height).px
currentHeight += paragraph.height
- // TODO(haoyuchang): solve the corner case where the ellipsis won't be applied when
- // currentLineNum == maxLines but there are still more paragraphs
if (paragraph.didExceedMaxLines ||
(currentLineCount == maxLines && index != this.paragraphInfoList.lastIndex)
) {
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt b/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt
index 36420a4..ad41e95 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt
@@ -281,8 +281,6 @@
}
fun layout(constraints: Constraints) {
- // TODO(haoyuchang): fix that when softWarp is false and overflow is Ellipsis, ellipsis
- // doesn't work.
val minWidth = constraints.minWidth.value.toFloat()
val widthMatters = softWrap || overflow == TextOverflow.Ellipsis
val maxWidth = if (widthMatters) {
@@ -382,7 +380,6 @@
) = assumeLayout { layoutResult ->
if (start == end) return
val selectionPath = layoutResult.multiParagraph.getPathForRange(start, end)
- // TODO(haoyuchang): check if move this paint to parameter is better
canvas.drawPath(selectionPath, Paint().apply { this.color = color })
}
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
index 1363054..bacff45 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
@@ -122,7 +122,6 @@
override val height: Float
get() = layout.let {
- // TODO(haoyuchang): Figure out a way to add bottomPadding properly
val lineCount = it.lineCount
if (maxLines != null &&
maxLines >= 0 &&
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/style/BaselineShift.kt b/ui/ui-text/src/main/java/androidx/ui/text/style/BaselineShift.kt
index bec9cbc..a35aee7 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/style/BaselineShift.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/style/BaselineShift.kt
@@ -45,7 +45,6 @@
/**
* Linearly interpolate two [BaselineShift]s.
*/
-// TODO(siyamed): This should not accept nullables
fun lerp(start: BaselineShift?, stop: BaselineShift?, fraction: Float): BaselineShift? {
if (start == null && stop == null) {
return null