Assigned
Status Update
No update yet.
Comments
ap...@google.com
Project: platform/frameworks/support
Branch: androidx-main
commit bbe1d83f1c87167b0da0104a8cc997db7b00f498
Author: Anastasia Soboleva <soboleva@google.com>
Date: Mon Sep 25 09:38:18 2023
Add Uspecified to Hyphens, LineBreak, TextAlign, TextDirection
ParagraphStyle and TextStyle takes these as non-null params in ctors, copy and merge to avoid boxing.
Deprecated getTextAlign and similar public getters nullable for binary compat. Introduced non-null counterparts that compile into primitives.
Before:
5,150 ns 5 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.draw[size=2, spanCount=4]
18,965 ns 99 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeOnly[size=2, spanCount=4]
44,769 ns 208 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeMeasureLayout[size=2, spanCount=4]
After:
5,265 ns 5 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.draw[size=2, spanCount=4]
19,054 ns 99 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeOnly[size=2, spanCount=4]
44,617 ns 201 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeMeasureLayout[size=2, spanCount=4]
Before:
159,575 ns 647 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[10]
138,596 ns 580 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[10]
191,924 ns 715 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[10]
1,653,166 ns 6220 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[100]
1,246,603 ns 5490 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[100]
1,529,656 ns 6859 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[100]
After:
177,292 ns 597 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[10]
139,119 ns 550 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[10]
186,741 ns 645 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[10]
1,642,789 ns 5500 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[100]
1,352,991 ns 5231 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[100]
1,570,829 ns 6159 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[100]
Test: ui:ui-text:test, ui:ui-text:cC
Test: benchmarks
Bug: 299490814
Relnote: "Introduced a special Unspecified value for TextAlign, TextDirection, Hyphens and LineBreak fields of the ParagraphTextStyle to replace “null”. Because these classes are inline classes, by replacing nullable with the Unspecified, we avoid primitive type boxing.
Constructors, getters and other methods in TextStyle and Paragraph style were update to accept the mentioned parameters as non-null types."
Change-Id: I4197ea85db556846ecad27ca8f561955e2370951
M compose/material/material/src/commonMain/kotlin/androidx/compose/material/Text.kt
M compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Text.kt
M compose/ui/ui-inspection/src/androidTest/java/androidx/compose/ui/inspection/inspector/ParameterFactoryTest.kt
M compose/ui/ui-text/api/current.ignore
M compose/ui/ui-text/api/current.txt
M compose/ui/ui-text/api/restricted_current.ignore
M compose/ui/ui-text/api/restricted_current.txt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/AndroidParagraphTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/AndroidParagraphTextDirectionTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTextDirectionTest.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphIntrinsics.android.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/LineBreak.android.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/ParagraphStyleTest.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/TextStyleTest.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraphIntrinsics.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/Hyphens.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/LineBreak.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextAlign.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDirection.kt
M compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt
M compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/LineBreak.skiko.kt
M tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
M wear/compose/compose-material-core/src/main/java/androidx/wear/compose/materialcore/Text.kt
https://android-review.googlesource.com/2763568
Branch: androidx-main
commit bbe1d83f1c87167b0da0104a8cc997db7b00f498
Author: Anastasia Soboleva <soboleva@google.com>
Date: Mon Sep 25 09:38:18 2023
Add Uspecified to Hyphens, LineBreak, TextAlign, TextDirection
ParagraphStyle and TextStyle takes these as non-null params in ctors, copy and merge to avoid boxing.
Deprecated getTextAlign and similar public getters nullable for binary compat. Introduced non-null counterparts that compile into primitives.
Before:
5,150 ns 5 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.draw[size=2, spanCount=4]
18,965 ns 99 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeOnly[size=2, spanCount=4]
44,769 ns 208 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeMeasureLayout[size=2, spanCount=4]
After:
5,265 ns 5 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.draw[size=2, spanCount=4]
19,054 ns 99 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeOnly[size=2, spanCount=4]
44,617 ns 201 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeMeasureLayout[size=2, spanCount=4]
Before:
159,575 ns 647 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[10]
138,596 ns 580 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[10]
191,924 ns 715 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[10]
1,653,166 ns 6220 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[100]
1,246,603 ns 5490 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[100]
1,529,656 ns 6859 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[100]
After:
177,292 ns 597 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[10]
139,119 ns 550 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[10]
186,741 ns 645 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[10]
1,642,789 ns 5500 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[100]
1,352,991 ns 5231 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[100]
1,570,829 ns 6159 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[100]
Test: ui:ui-text:test, ui:ui-text:cC
Test: benchmarks
Bug: 299490814
Relnote: "Introduced a special Unspecified value for TextAlign, TextDirection, Hyphens and LineBreak fields of the ParagraphTextStyle to replace “null”. Because these classes are inline classes, by replacing nullable with the Unspecified, we avoid primitive type boxing.
Constructors, getters and other methods in TextStyle and Paragraph style were update to accept the mentioned parameters as non-null types."
Change-Id: I4197ea85db556846ecad27ca8f561955e2370951
M compose/material/material/src/commonMain/kotlin/androidx/compose/material/Text.kt
M compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Text.kt
M compose/ui/ui-inspection/src/androidTest/java/androidx/compose/ui/inspection/inspector/ParameterFactoryTest.kt
M compose/ui/ui-text/api/current.ignore
M compose/ui/ui-text/api/current.txt
M compose/ui/ui-text/api/restricted_current.ignore
M compose/ui/ui-text/api/restricted_current.txt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/AndroidParagraphTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/AndroidParagraphTextDirectionTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTextDirectionTest.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphIntrinsics.android.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/LineBreak.android.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/ParagraphStyleTest.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/TextStyleTest.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraphIntrinsics.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/Hyphens.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/LineBreak.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextAlign.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDirection.kt
M compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt
M compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/LineBreak.skiko.kt
M tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
M wear/compose/compose-material-core/src/main/java/androidx/wear/compose/materialcore/Text.kt
ap...@google.com
Project: platform/frameworks/support
Branch: androidx-main
commit e21f04493c5ee666dc8fc472ff3e085e4ab88945
Author: Anastasia Soboleva <soboleva@google.com>
Date: Mon Oct 09 12:16:50 2023
Replace TextAlign? parameter with TextAlign in tv Text
Since tv's Text is still experimental, we better replace nullable with non-null to avoid primitive type boxing
Bug: 299490814
Test: TextTest
Relnote: "TV Text component's TextAlign parameter is now non-null"
Change-Id: Ib73b136b5d997de3869ca63e7c6dcad5e513ec1e
M tv/tv-material/api/current.txt
M tv/tv-material/api/restricted_current.txt
M tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
https://android-review.googlesource.com/2775146
Branch: androidx-main
commit e21f04493c5ee666dc8fc472ff3e085e4ab88945
Author: Anastasia Soboleva <soboleva@google.com>
Date: Mon Oct 09 12:16:50 2023
Replace TextAlign? parameter with TextAlign in tv Text
Since tv's Text is still experimental, we better replace nullable with non-null to avoid primitive type boxing
Bug: 299490814
Test: TextTest
Relnote: "TV Text component's TextAlign parameter is now non-null"
Change-Id: Ib73b136b5d997de3869ca63e7c6dcad5e513ec1e
M tv/tv-material/api/current.txt
M tv/tv-material/api/restricted_current.txt
M tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
Description
Requested
There's another bug,