Merge "Update KSP to 1.8.20-1.0.11" into androidx-main
diff --git a/.github/ci-control/ci-config.json b/.github/ci-control/ci-config.json
index 06a5ee1..2d07c46 100644
--- a/.github/ci-control/ci-config.json
+++ b/.github/ci-control/ci-config.json
@@ -7,7 +7,6 @@
],
"compose" : {
"include" : [
- "compose-runtime"
],
"default": false
},
diff --git a/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/consumer/task/MergeBaselineProfileTask.kt b/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/consumer/task/MergeBaselineProfileTask.kt
index 7067cde0..cb5582f 100644
--- a/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/consumer/task/MergeBaselineProfileTask.kt
+++ b/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/consumer/task/MergeBaselineProfileTask.kt
@@ -232,7 +232,12 @@
.file(BASELINE_PROFILE_FILENAME)
.get()
.asFile
- .writeText(filteredProfileRules.joinToString(System.lineSeparator()))
+ .apply {
+ delete()
+ if (filteredProfileRules.isNotEmpty()) {
+ writeText(filteredProfileRules.joinToString(System.lineSeparator()))
+ }
+ }
// If this is a library we can stop here and don't manage the startup profiles.
if (library.get()) {
@@ -243,6 +248,17 @@
val startupRules = baselineProfileFileCollection.files
.readLines { FILENAME_MATCHER_STARTUP_PROFILE in it.name }
+ if (variantName.isPresent && startupRules.isEmpty()) {
+ logger.warn(
+ """
+ No startup profile rules were generated for the variant `${variantName.get()}`.
+ This is most likely because there are no instrumentation test with baseline profile
+ rule, which specify `includeInStartupProfile = true`. If this is not intentional
+ check that tests for this variant exist in the `baselineProfile` dependency module.
+ """.trimIndent()
+ )
+ }
+
// Use same sorting without filter for startup profiles.
val sortedProfileRules = startupRules
.asSequence()
@@ -258,7 +274,12 @@
.file(STARTUP_PROFILE_FILENAME)
.get()
.asFile
- .writeText(sortedProfileRules.joinToString(System.lineSeparator()))
+ .apply {
+ delete()
+ if (sortedProfileRules.isNotEmpty()) {
+ writeText(sortedProfileRules.joinToString(System.lineSeparator()))
+ }
+ }
}
private fun Pair<RuleType, String>.isInclude(): Boolean = first == RuleType.INCLUDE
diff --git a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt
index 69455db..a7e1cdf 100644
--- a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt
+++ b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt
@@ -151,6 +151,32 @@
}
@Test
+ fun testGenerateTaskWithNoFlavorsForApplicationAndNoStartupProfile() {
+ projectSetup.consumer.setup(
+ androidPlugin = ANDROID_APPLICATION_PLUGIN
+ )
+ projectSetup.producer.setupWithoutFlavors(
+ releaseProfileLines = listOf(
+ Fixtures.CLASS_1_METHOD_1,
+ Fixtures.CLASS_1,
+ ),
+ releaseStartupProfileLines = listOf()
+ )
+
+ gradleRunner
+ .withArguments("generateBaselineProfile", "--stacktrace")
+ .build()
+
+ assertThat(readBaselineProfileFileContent("release"))
+ .containsExactly(
+ Fixtures.CLASS_1,
+ Fixtures.CLASS_1_METHOD_1,
+ )
+
+ assertThat(startupProfileFile("release").exists()).isFalse()
+ }
+
+ @Test
fun testGenerateTaskWithFlavorsAndDefaultMerge() {
projectSetup.consumer.setup(
androidPlugin = ANDROID_APPLICATION_PLUGIN,
diff --git a/benchmark/integration-tests/baselineprofile-consumer/src/release/generated/baselineProfiles/expected-startup-prof.txt b/benchmark/integration-tests/baselineprofile-consumer/src/release/generated/baselineProfiles/expected-startup-prof.txt
new file mode 100644
index 0000000..8ac4720
--- /dev/null
+++ b/benchmark/integration-tests/baselineprofile-consumer/src/release/generated/baselineProfiles/expected-startup-prof.txt
@@ -0,0 +1,538 @@
+Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;
+HSPLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;->$r8$lambda$CNqLK7smWTFjXaIfqGSDUWf8U50(Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;)V
+PLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;->$r8$lambda$G2Q0ZfVkJNYXyLJAm2IZ1xq3Lto(Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;)V
+HSPLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;-><init>()V
+HSPLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;->onCreate(Landroid/os/Bundle;)V
+PLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;->onResume$lambda$1$lambda$0(Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;)V
+HSPLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;->onResume$lambda$1(Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;)V
+HSPLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;->onResume()V
+PLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity$$ExternalSyntheticLambda0;-><init>(Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;)V
+PLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity$$ExternalSyntheticLambda0;->run()V
+Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity$$ExternalSyntheticLambda1;
+HSPLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity$$ExternalSyntheticLambda1;-><init>(Landroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity;)V
+HSPLandroidx/benchmark/integration/baselineprofile/consumer/EmptyActivity$$ExternalSyntheticLambda1;->run()V
+Landroidx/concurrent/futures/AbstractResolvableFuture;
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture;-><clinit>()V
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture;-><init>()V
+PLandroidx/concurrent/futures/AbstractResolvableFuture;->afterDone()V
+PLandroidx/concurrent/futures/AbstractResolvableFuture;->clearListeners(Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;)Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;
+PLandroidx/concurrent/futures/AbstractResolvableFuture;->complete(Landroidx/concurrent/futures/AbstractResolvableFuture;)V
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture;->get()Ljava/lang/Object;
+PLandroidx/concurrent/futures/AbstractResolvableFuture;->getDoneValue(Ljava/lang/Object;)Ljava/lang/Object;
+PLandroidx/concurrent/futures/AbstractResolvableFuture;->releaseWaiters()V
+PLandroidx/concurrent/futures/AbstractResolvableFuture;->set(Ljava/lang/Object;)Z
+Landroidx/concurrent/futures/AbstractResolvableFuture$AtomicHelper;
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$AtomicHelper;-><init>()V
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$AtomicHelper;-><init>(Landroidx/concurrent/futures/AbstractResolvableFuture$1;)V
+Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;
+PLandroidx/concurrent/futures/AbstractResolvableFuture$Listener;-><clinit>()V
+PLandroidx/concurrent/futures/AbstractResolvableFuture$Listener;-><init>(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+Landroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;-><init>(Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;)V
+PLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->casListeners(Landroidx/concurrent/futures/AbstractResolvableFuture;Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;)Z
+PLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->casValue(Landroidx/concurrent/futures/AbstractResolvableFuture;Ljava/lang/Object;Ljava/lang/Object;)Z
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->casWaiters(Landroidx/concurrent/futures/AbstractResolvableFuture;Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;)Z
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->putNext(Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;)V
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->putThread(Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;Ljava/lang/Thread;)V
+Landroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper$$ExternalSyntheticBackportWithForwarding0;
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+Landroidx/concurrent/futures/AbstractResolvableFuture$SetFuture;
+Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$Waiter;-><clinit>()V
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$Waiter;-><init>()V
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$Waiter;-><init>(Z)V
+HSPLandroidx/concurrent/futures/AbstractResolvableFuture$Waiter;->setNext(Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;)V
+PLandroidx/concurrent/futures/AbstractResolvableFuture$Waiter;->unpark()V
+Landroidx/concurrent/futures/ResolvableFuture;
+HSPLandroidx/concurrent/futures/ResolvableFuture;-><init>()V
+HSPLandroidx/concurrent/futures/ResolvableFuture;->create()Landroidx/concurrent/futures/ResolvableFuture;
+PLandroidx/concurrent/futures/ResolvableFuture;->set(Ljava/lang/Object;)Z
+Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+HSPLandroidx/constraintlayout/solver/ArrayLinkedVariables;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/ArrayLinkedVariables;-><init>(Landroidx/constraintlayout/solver/ArrayRow;Landroidx/constraintlayout/solver/Cache;)V
+Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/ArrayRow;-><init>()V
+HSPLandroidx/constraintlayout/solver/ArrayRow;-><init>(Landroidx/constraintlayout/solver/Cache;)V
+HSPLandroidx/constraintlayout/solver/ArrayRow;->addError(Landroidx/constraintlayout/solver/LinearSystem;I)Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->addSingleError(Landroidx/constraintlayout/solver/SolverVariable;I)Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->chooseSubject(Landroidx/constraintlayout/solver/LinearSystem;)Z
+HSPLandroidx/constraintlayout/solver/ArrayRow;->chooseSubjectInVariables(Landroidx/constraintlayout/solver/LinearSystem;)Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->createRowCentering(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;IFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;I)Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->createRowEquals(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;I)Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->createRowGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;I)Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->createRowLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;I)Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->ensurePositiveConstant()V
+HSPLandroidx/constraintlayout/solver/ArrayRow;->getKey()Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/ArrayRow;->hasKeyVariable()Z
+HSPLandroidx/constraintlayout/solver/ArrayRow;->isEmpty()Z
+HSPLandroidx/constraintlayout/solver/ArrayRow;->isNew(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/LinearSystem;)Z
+HSPLandroidx/constraintlayout/solver/ArrayRow;->pivot(Landroidx/constraintlayout/solver/SolverVariable;)V
+HSPLandroidx/constraintlayout/solver/ArrayRow;->reset()V
+HSPLandroidx/constraintlayout/solver/ArrayRow;->updateFromFinalVariable(Landroidx/constraintlayout/solver/LinearSystem;Landroidx/constraintlayout/solver/SolverVariable;Z)V
+HSPLandroidx/constraintlayout/solver/ArrayRow;->updateFromRow(Landroidx/constraintlayout/solver/ArrayRow;Z)V
+HSPLandroidx/constraintlayout/solver/ArrayRow;->updateFromSystem(Landroidx/constraintlayout/solver/LinearSystem;)V
+Landroidx/constraintlayout/solver/ArrayRow$ArrayRowVariables;
+Landroidx/constraintlayout/solver/Cache;
+HSPLandroidx/constraintlayout/solver/Cache;-><init>()V
+Landroidx/constraintlayout/solver/LinearSystem;
+HSPLandroidx/constraintlayout/solver/LinearSystem;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/LinearSystem;-><init>()V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->acquireSolverVariable(Landroidx/constraintlayout/solver/SolverVariable$Type;Ljava/lang/String;)Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addCentering(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;IFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addConstraint(Landroidx/constraintlayout/solver/ArrayRow;)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;I)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addRow(Landroidx/constraintlayout/solver/ArrayRow;)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->addSingleError(Landroidx/constraintlayout/solver/ArrayRow;II)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->computeValues()V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->createErrorVariable(ILjava/lang/String;)Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->createRow()Landroidx/constraintlayout/solver/ArrayRow;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->createSlackVariable()Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->enforceBFS(Landroidx/constraintlayout/solver/LinearSystem$Row;)I
+HSPLandroidx/constraintlayout/solver/LinearSystem;->getCache()Landroidx/constraintlayout/solver/Cache;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->getMetrics()Landroidx/constraintlayout/solver/Metrics;
+HSPLandroidx/constraintlayout/solver/LinearSystem;->getObjectVariableValue(Ljava/lang/Object;)I
+HSPLandroidx/constraintlayout/solver/LinearSystem;->increaseTableSize()V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->minimize()V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->minimizeGoal(Landroidx/constraintlayout/solver/LinearSystem$Row;)V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->optimize(Landroidx/constraintlayout/solver/LinearSystem$Row;Z)I
+HSPLandroidx/constraintlayout/solver/LinearSystem;->releaseRows()V
+HSPLandroidx/constraintlayout/solver/LinearSystem;->reset()V
+Landroidx/constraintlayout/solver/LinearSystem$Row;
+Landroidx/constraintlayout/solver/LinearSystem$ValuesRow;
+HSPLandroidx/constraintlayout/solver/LinearSystem$ValuesRow;-><init>(Landroidx/constraintlayout/solver/LinearSystem;Landroidx/constraintlayout/solver/Cache;)V
+Landroidx/constraintlayout/solver/Pools$Pool;
+Landroidx/constraintlayout/solver/Pools$SimplePool;
+HSPLandroidx/constraintlayout/solver/Pools$SimplePool;-><init>(I)V
+HSPLandroidx/constraintlayout/solver/Pools$SimplePool;->acquire()Ljava/lang/Object;
+HSPLandroidx/constraintlayout/solver/Pools$SimplePool;->release(Ljava/lang/Object;)Z
+HSPLandroidx/constraintlayout/solver/Pools$SimplePool;->releaseAll([Ljava/lang/Object;I)V
+Landroidx/constraintlayout/solver/PriorityGoalRow;
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow;-><init>(Landroidx/constraintlayout/solver/Cache;)V
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow;->addError(Landroidx/constraintlayout/solver/SolverVariable;)V
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow;->addToGoal(Landroidx/constraintlayout/solver/SolverVariable;)V
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow;->clear()V
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow;->getPivotCandidate(Landroidx/constraintlayout/solver/LinearSystem;[Z)Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow;->removeGoal(Landroidx/constraintlayout/solver/SolverVariable;)V
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow;->updateFromRow(Landroidx/constraintlayout/solver/ArrayRow;Z)V
+Landroidx/constraintlayout/solver/PriorityGoalRow$GoalVariableAccessor;
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow$GoalVariableAccessor;-><init>(Landroidx/constraintlayout/solver/PriorityGoalRow;Landroidx/constraintlayout/solver/PriorityGoalRow;)V
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow$GoalVariableAccessor;->addToGoal(Landroidx/constraintlayout/solver/SolverVariable;F)Z
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow$GoalVariableAccessor;->init(Landroidx/constraintlayout/solver/SolverVariable;)V
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow$GoalVariableAccessor;->isNegative()Z
+HSPLandroidx/constraintlayout/solver/PriorityGoalRow$GoalVariableAccessor;->reset()V
+Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/SolverVariable;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/SolverVariable;-><init>(Landroidx/constraintlayout/solver/SolverVariable$Type;Ljava/lang/String;)V
+HSPLandroidx/constraintlayout/solver/SolverVariable;->addToRow(Landroidx/constraintlayout/solver/ArrayRow;)V
+HSPLandroidx/constraintlayout/solver/SolverVariable;->increaseErrorId()V
+HSPLandroidx/constraintlayout/solver/SolverVariable;->removeFromRow(Landroidx/constraintlayout/solver/ArrayRow;)V
+HSPLandroidx/constraintlayout/solver/SolverVariable;->reset()V
+HSPLandroidx/constraintlayout/solver/SolverVariable;->setFinalValue(Landroidx/constraintlayout/solver/LinearSystem;F)V
+HSPLandroidx/constraintlayout/solver/SolverVariable;->setType(Landroidx/constraintlayout/solver/SolverVariable$Type;Ljava/lang/String;)V
+HSPLandroidx/constraintlayout/solver/SolverVariable;->updateReferencesWithNewDefinition(Landroidx/constraintlayout/solver/ArrayRow;)V
+Landroidx/constraintlayout/solver/SolverVariable$Type;
+HSPLandroidx/constraintlayout/solver/SolverVariable$Type;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/SolverVariable$Type;-><init>(Ljava/lang/String;I)V
+Landroidx/constraintlayout/solver/SolverVariableValues;
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;-><init>(Landroidx/constraintlayout/solver/ArrayRow;Landroidx/constraintlayout/solver/Cache;)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->add(Landroidx/constraintlayout/solver/SolverVariable;FZ)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->addToHashMap(Landroidx/constraintlayout/solver/SolverVariable;I)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->addVariable(ILandroidx/constraintlayout/solver/SolverVariable;F)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->clear()V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->divideByAmount(F)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->findEmptySlot()I
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->get(Landroidx/constraintlayout/solver/SolverVariable;)F
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->getCurrentSize()I
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->getVariable(I)Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->getVariableValue(I)F
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->indexOf(Landroidx/constraintlayout/solver/SolverVariable;)I
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->insertVariable(ILandroidx/constraintlayout/solver/SolverVariable;F)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->invert()V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->remove(Landroidx/constraintlayout/solver/SolverVariable;Z)F
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->removeFromHashMap(Landroidx/constraintlayout/solver/SolverVariable;)V
+HSPLandroidx/constraintlayout/solver/SolverVariableValues;->use(Landroidx/constraintlayout/solver/ArrayRow;Z)F
+Landroidx/constraintlayout/solver/widgets/Barrier;
+Landroidx/constraintlayout/solver/widgets/ChainHead;
+Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;-><init>(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;IIZ)Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getSolverVariable()Landroidx/constraintlayout/solver/SolverVariable;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;->resetSolverVariable(Landroidx/constraintlayout/solver/Cache;)V
+Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;-><init>(Ljava/lang/String;I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->values()[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;-><init>()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->addAnchors()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->addFirst()Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->addToSolver(Landroidx/constraintlayout/solver/LinearSystem;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->applyConstraints(Landroidx/constraintlayout/solver/LinearSystem;ZZZZLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;ZLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;IIIIFZZZZIIIIFZ)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->createObjectVariables(Landroidx/constraintlayout/solver/LinearSystem;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getBaselineDistance()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getCompanionWidget()Ljava/lang/Object;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getDimensionBehaviour(I)Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHorizontalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getMinHeight()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getMinWidth()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getParent()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVerticalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getX()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->getY()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->isChainHead(I)Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->isInHorizontalChain()Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->isInVerticalChain()Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->reset()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->resetSolverVariables(Landroidx/constraintlayout/solver/Cache;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setBaselineDistance(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setCompanionWidget(Ljava/lang/Object;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setDimensionRatio(Ljava/lang/String;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setFrame(IIII)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHasBaseline(Z)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeight(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalBiasPercent(F)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalChainStyle(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalDimensionBehaviour(Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalMatchStyle(IIIF)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalWeight(F)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setInBarrier(IZ)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setMaxHeight(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setMaxWidth(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setMinHeight(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setMinWidth(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setParent(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVerticalBiasPercent(F)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVerticalChainStyle(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVerticalDimensionBehaviour(Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVerticalMatchStyle(IIIF)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVerticalWeight(F)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVisibility(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidth(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setX(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->setY(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget;->updateFromSolver(Landroidx/constraintlayout/solver/LinearSystem;)V
+Landroidx/constraintlayout/solver/widgets/ConstraintWidget$1;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget$1;-><clinit>()V
+Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;-><init>(Ljava/lang/String;I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->values()[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;-><init>()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->addChildrenToSolver(Landroidx/constraintlayout/solver/LinearSystem;)Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getMeasurer()Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measurer;
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getOptimizationLevel()I
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->invalidateGraph()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->invalidateMeasures()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->isHeightMeasuredTooSmall()Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->isWidthMeasuredTooSmall()Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->layout()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->measure(IIIIIIIII)J
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->optimizeFor(I)Z
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->resetChains()V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setMeasurer(Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measurer;)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setOptimizationLevel(I)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setRtl(Z)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->updateChildrenFromSolver(Landroidx/constraintlayout/solver/LinearSystem;[Z)V
+HSPLandroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->updateHierarchy()V
+Landroidx/constraintlayout/solver/widgets/Guideline;
+Landroidx/constraintlayout/solver/widgets/Helper;
+Landroidx/constraintlayout/solver/widgets/HelperWidget;
+Landroidx/constraintlayout/solver/widgets/Optimizer;
+HSPLandroidx/constraintlayout/solver/widgets/Optimizer;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/widgets/Optimizer;->checkMatchParent(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;Landroidx/constraintlayout/solver/LinearSystem;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
+HSPLandroidx/constraintlayout/solver/widgets/Optimizer;->enabled(II)Z
+Landroidx/constraintlayout/solver/widgets/VirtualLayout;
+Landroidx/constraintlayout/solver/widgets/WidgetContainer;
+HSPLandroidx/constraintlayout/solver/widgets/WidgetContainer;-><init>()V
+HSPLandroidx/constraintlayout/solver/widgets/WidgetContainer;->add(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
+HSPLandroidx/constraintlayout/solver/widgets/WidgetContainer;->removeAllChildren()V
+HSPLandroidx/constraintlayout/solver/widgets/WidgetContainer;->resetSolverVariables(Landroidx/constraintlayout/solver/Cache;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure;-><init>(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;)V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure;->measure(Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measurer;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Z)Z
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure;->measureChildren(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;)V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure;->solveLinearSystem(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;Ljava/lang/String;II)V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure;->solverMeasure(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;IIIIIIIII)J
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure;->updateHierarchy(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measure;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measure;-><init>()V
+Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measurer;
+Landroidx/constraintlayout/solver/widgets/analyzer/Dependency;
+Landroidx/constraintlayout/solver/widgets/analyzer/DependencyGraph;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DependencyGraph;-><init>(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;)V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DependencyGraph;->invalidateGraph()V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DependencyGraph;->invalidateMeasures()V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DependencyGraph;->setMeasurer(Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measurer;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/DependencyNode;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DependencyNode;-><init>(Landroidx/constraintlayout/solver/widgets/analyzer/WidgetRun;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/DependencyNode$Type;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DependencyNode$Type;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DependencyNode$Type;-><init>(Ljava/lang/String;I)V
+Landroidx/constraintlayout/solver/widgets/analyzer/DimensionDependency;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/DimensionDependency;-><init>(Landroidx/constraintlayout/solver/widgets/analyzer/WidgetRun;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/HorizontalWidgetRun;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/HorizontalWidgetRun;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/HorizontalWidgetRun;-><init>(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/VerticalWidgetRun;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/VerticalWidgetRun;-><init>(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/WidgetRun;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/WidgetRun;-><init>(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
+Landroidx/constraintlayout/solver/widgets/analyzer/WidgetRun$RunType;
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/WidgetRun$RunType;-><clinit>()V
+HSPLandroidx/constraintlayout/solver/widgets/analyzer/WidgetRun$RunType;-><init>(Ljava/lang/String;I)V
+Landroidx/constraintlayout/widget/ConstraintHelper;
+Landroidx/constraintlayout/widget/ConstraintLayout;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->access$000(Landroidx/constraintlayout/widget/ConstraintLayout;)Ljava/util/ArrayList;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->applyConstraintsFromLayoutParams(ZLandroid/view/View;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;Landroid/util/SparseArray;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->dispatchDraw(Landroid/graphics/Canvas;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->generateLayoutParams(Landroid/util/AttributeSet;)Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->getPaddingWidth()I
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->getViewWidget(Landroid/view/View;)Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->init(Landroid/util/AttributeSet;II)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->isRtl()Z
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->markHierarchyDirty()V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->onLayout(ZIIII)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->onMeasure(II)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->onViewAdded(Landroid/view/View;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->requestLayout()V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->resolveMeasuredDimension(IIIIZZ)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->resolveSystem(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;III)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->setChildrenConstraints()V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->setSelfDimensionBehaviour(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;IIII)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout;->updateHierarchy()Z
+Landroidx/constraintlayout/widget/ConstraintLayout$1;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$1;-><clinit>()V
+Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolveLayoutDirection(I)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->validate()V
+Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table;-><clinit>()V
+Landroidx/constraintlayout/widget/ConstraintLayout$Measurer;
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;-><init>(Landroidx/constraintlayout/widget/ConstraintLayout;Landroidx/constraintlayout/widget/ConstraintLayout;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->captureLayoutInfos(IIIIII)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->didMeasures()V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->measure(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/analyzer/BasicMeasure$Measure;)V
+Landroidx/constraintlayout/widget/ConstraintLayoutStates;
+Landroidx/constraintlayout/widget/ConstraintSet;
+Landroidx/constraintlayout/widget/Guideline;
+Landroidx/constraintlayout/widget/Placeholder;
+Landroidx/constraintlayout/widget/R$styleable;
+HSPLandroidx/constraintlayout/widget/R$styleable;-><clinit>()V
+Landroidx/constraintlayout/widget/VirtualLayout;
+Landroidx/core/app/CoreComponentFactory;
+HSPLandroidx/core/app/CoreComponentFactory;-><init>()V
+HSPLandroidx/core/app/CoreComponentFactory;->checkCompatWrapper(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLandroidx/core/app/CoreComponentFactory;->instantiateActivity(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/app/Activity;
+HSPLandroidx/core/app/CoreComponentFactory;->instantiateApplication(Ljava/lang/ClassLoader;Ljava/lang/String;)Landroid/app/Application;
+HSPLandroidx/core/app/CoreComponentFactory;->instantiateProvider(Ljava/lang/ClassLoader;Ljava/lang/String;)Landroid/content/ContentProvider;
+PLandroidx/core/app/CoreComponentFactory;->instantiateReceiver(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/content/BroadcastReceiver;
+Landroidx/core/app/CoreComponentFactory$CompatWrapped;
+Landroidx/core/app/NavUtils$$ExternalSyntheticApiModelOutline0;
+HSPLandroidx/core/app/NavUtils$$ExternalSyntheticApiModelOutline0;->m$1(Landroidx/constraintlayout/widget/ConstraintLayout;)I
+HSPLandroidx/core/app/NavUtils$$ExternalSyntheticApiModelOutline0;->m$2(Landroidx/constraintlayout/widget/ConstraintLayout;)I
+HSPLandroidx/core/app/NavUtils$$ExternalSyntheticApiModelOutline0;->m(Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;)I
+HSPLandroidx/core/app/NavUtils$$ExternalSyntheticApiModelOutline0;->m(Landroidx/constraintlayout/widget/ConstraintLayout;)I
+Landroidx/core/os/TraceCompat$$ExternalSyntheticApiModelOutline0;
+HSPLandroidx/core/os/TraceCompat$$ExternalSyntheticApiModelOutline0;->m()Z
+Landroidx/profileinstaller/Encoding$$ExternalSyntheticApiModelOutline0;
+HSPLandroidx/profileinstaller/Encoding$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/Choreographer;
+HSPLandroidx/profileinstaller/Encoding$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/Looper;)Landroid/os/Handler;
+HSPLandroidx/profileinstaller/Encoding$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/Choreographer;Landroid/view/Choreographer$FrameCallback;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver;-><init>()V
+PLandroidx/profileinstaller/ProfileInstallReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver;->saveProfile(Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver$$ExternalSyntheticLambda0;-><init>()V
+PLandroidx/profileinstaller/ProfileInstallReceiver$ResultDiagnostics;-><init>(Landroidx/profileinstaller/ProfileInstallReceiver;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver$ResultDiagnostics;->onResultReceived(ILjava/lang/Object;)V
+PLandroidx/profileinstaller/ProfileInstaller;-><clinit>()V
+PLandroidx/profileinstaller/ProfileInstaller;->hasAlreadyWrittenProfileForThisInstall(Landroid/content/pm/PackageInfo;Ljava/io/File;Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;)Z
+PLandroidx/profileinstaller/ProfileInstaller;->writeProfile(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstaller;->writeProfile(Landroid/content/Context;Ljava/util/concurrent/Executor;Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;)V
+PLandroidx/profileinstaller/ProfileInstaller;->writeProfile(Landroid/content/Context;Ljava/util/concurrent/Executor;Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;Z)V
+PLandroidx/profileinstaller/ProfileInstaller$1;-><init>()V
+PLandroidx/profileinstaller/ProfileInstaller$1;->onResultReceived(ILjava/lang/Object;)V
+PLandroidx/profileinstaller/ProfileInstaller$2;-><init>()V
+PLandroidx/profileinstaller/ProfileInstaller$2;->onResultReceived(ILjava/lang/Object;)V
+Landroidx/profileinstaller/ProfileInstallerInitializer;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;-><init>()V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->create(Landroid/content/Context;)Landroidx/profileinstaller/ProfileInstallerInitializer$Result;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->delayAfterFirstFrame(Landroid/content/Context;)V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->dependencies()Ljava/util/List;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->installAfterDelay(Landroid/content/Context;)V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$delayAfterFirstFrame$0$androidx-profileinstaller-ProfileInstallerInitializer(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$installAfterDelay$1(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$writeInBackground$2(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->writeInBackground(Landroid/content/Context;)V
+Landroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda0;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda0;->run()V
+Landroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;-><init>(Landroidx/profileinstaller/ProfileInstallerInitializer;Landroid/content/Context;)V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;->run()V
+PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda2;-><init>(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda2;->run()V
+Landroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl;->lambda$postFrameCallback$0(Ljava/lang/Runnable;J)V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl;->postFrameCallback(Ljava/lang/Runnable;)V
+Landroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl$$ExternalSyntheticLambda2;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl$$ExternalSyntheticLambda2;-><init>(Ljava/lang/Runnable;)V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl$$ExternalSyntheticLambda2;->doFrame(J)V
+Landroidx/profileinstaller/ProfileInstallerInitializer$Handler28Impl;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Handler28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
+Landroidx/profileinstaller/ProfileInstallerInitializer$Result;
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Result;-><init>()V
+Landroidx/profileinstaller/ProfileVerifier;
+HSPLandroidx/profileinstaller/ProfileVerifier;-><clinit>()V
+HSPLandroidx/profileinstaller/ProfileVerifier;->getCompilationStatusAsync()Lcom/google/common/util/concurrent/ListenableFuture;
+PLandroidx/profileinstaller/ProfileVerifier;->getPackageLastUpdateTime(Landroid/content/Context;)J
+PLandroidx/profileinstaller/ProfileVerifier;->setCompilationStatus(IZZ)Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;
+PLandroidx/profileinstaller/ProfileVerifier;->writeProfileVerification(Landroid/content/Context;Z)Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;
+PLandroidx/profileinstaller/ProfileVerifier$Api33Impl;->getPackageInfo(Landroid/content/pm/PackageManager;Landroid/content/Context;)Landroid/content/pm/PackageInfo;
+PLandroidx/profileinstaller/ProfileVerifier$Cache;-><init>(IIJJ)V
+PLandroidx/profileinstaller/ProfileVerifier$Cache;->writeOnFile(Ljava/io/File;)V
+Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;
+PLandroidx/profileinstaller/ProfileVerifier$CompilationStatus;-><init>(IZZ)V
+PLandroidx/profileinstaller/ProfileVerifier$CompilationStatus;->getProfileInstallResultCode()I
+PLandroidx/profileinstaller/ProfileVerifier$CompilationStatus;->hasProfileEnqueuedForCompilation()Z
+PLandroidx/profileinstaller/ProfileVerifier$CompilationStatus;->isCompiledWithProfile()Z
+Landroidx/startup/AppInitializer;
+HSPLandroidx/startup/AppInitializer;-><clinit>()V
+HSPLandroidx/startup/AppInitializer;-><init>(Landroid/content/Context;)V
+HSPLandroidx/startup/AppInitializer;->discoverAndInitialize()V
+HSPLandroidx/startup/AppInitializer;->discoverAndInitialize(Landroid/os/Bundle;)V
+HSPLandroidx/startup/AppInitializer;->doInitialize(Ljava/lang/Class;Ljava/util/Set;)Ljava/lang/Object;
+HSPLandroidx/startup/AppInitializer;->getInstance(Landroid/content/Context;)Landroidx/startup/AppInitializer;
+Landroidx/startup/InitializationProvider;
+HSPLandroidx/startup/InitializationProvider;-><init>()V
+HSPLandroidx/startup/InitializationProvider;->onCreate()Z
+Landroidx/startup/Initializer;
+Landroidx/startup/R$string;
+Landroidx/tracing/Trace;
+HSPLandroidx/tracing/Trace;->beginSection(Ljava/lang/String;)V
+HSPLandroidx/tracing/Trace;->endSection()V
+HSPLandroidx/tracing/Trace;->isEnabled()Z
+Landroidx/tracing/TraceApi18Impl;
+HSPLandroidx/tracing/TraceApi18Impl;->beginSection(Ljava/lang/String;)V
+HSPLandroidx/tracing/TraceApi18Impl;->endSection()V
+Lcom/google/common/util/concurrent/ListenableFuture;
+PLkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+PLkotlin/Pair;->component1()Ljava/lang/Object;
+PLkotlin/Pair;->component2()Ljava/lang/Object;
+PLkotlin/Pair;->getFirst()Ljava/lang/Object;
+PLkotlin/Pair;->getSecond()Ljava/lang/Object;
+PLkotlin/TuplesKt;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+PLkotlin/collections/ArraysKt___ArraysJvmKt;->asList([Ljava/lang/Object;)Ljava/util/List;
+PLkotlin/collections/ArraysUtilJVM;->asList([Ljava/lang/Object;)Ljava/util/List;
+PLkotlin/collections/CollectionsKt__CollectionsKt;->getLastIndex(Ljava/util/List;)I
+PLkotlin/collections/CollectionsKt__CollectionsKt;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
+PLkotlin/collections/CollectionsKt__IterablesKt;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+PLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Appendable;
+PLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
+PLkotlin/collections/CollectionsKt___CollectionsKt;->minOrNull(Ljava/lang/Iterable;)Ljava/lang/Comparable;
+PLkotlin/collections/IntIterator;-><init>()V
+PLkotlin/internal/ProgressionUtilKt;->differenceModulo(III)I
+PLkotlin/internal/ProgressionUtilKt;->getProgressionLastElement(III)I
+PLkotlin/internal/ProgressionUtilKt;->mod(II)I
+Lkotlin/jvm/internal/Intrinsics;
+PLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+PLkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+HSPLkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+PLkotlin/jvm/internal/Lambda;-><init>(I)V
+PLkotlin/ranges/IntProgression;-><clinit>()V
+PLkotlin/ranges/IntProgression;-><init>(III)V
+PLkotlin/ranges/IntProgression;->getFirst()I
+PLkotlin/ranges/IntProgression;->getLast()I
+PLkotlin/ranges/IntProgression;->getStep()I
+PLkotlin/ranges/IntProgression;->iterator()Ljava/util/Iterator;
+PLkotlin/ranges/IntProgression;->iterator()Lkotlin/collections/IntIterator;
+PLkotlin/ranges/IntProgression$Companion;-><init>()V
+PLkotlin/ranges/IntProgression$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLkotlin/ranges/IntProgressionIterator;-><init>(III)V
+PLkotlin/ranges/IntProgressionIterator;->hasNext()Z
+PLkotlin/ranges/IntProgressionIterator;->nextInt()I
+PLkotlin/ranges/IntRange;-><clinit>()V
+PLkotlin/ranges/IntRange;-><init>(II)V
+PLkotlin/ranges/IntRange;->getEndInclusive()Ljava/lang/Integer;
+PLkotlin/ranges/IntRange;->getStart()Ljava/lang/Integer;
+PLkotlin/ranges/IntRange$Companion;-><init>()V
+PLkotlin/ranges/IntRange$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLkotlin/ranges/RangesKt___RangesKt;->coerceAtLeast(II)I
+PLkotlin/ranges/RangesKt___RangesKt;->coerceAtMost(II)I
+PLkotlin/ranges/RangesKt___RangesKt;->coerceIn(III)I
+PLkotlin/ranges/RangesKt___RangesKt;->until(II)Lkotlin/ranges/IntRange;
+PLkotlin/sequences/SequencesKt___SequencesKt;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+PLkotlin/sequences/SequencesKt___SequencesKt;->toCollection(Lkotlin/sequences/Sequence;Ljava/util/Collection;)Ljava/util/Collection;
+PLkotlin/sequences/SequencesKt___SequencesKt;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+PLkotlin/sequences/SequencesKt___SequencesKt;->toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+PLkotlin/sequences/TransformingSequence;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
+PLkotlin/sequences/TransformingSequence;->access$getSequence$p(Lkotlin/sequences/TransformingSequence;)Lkotlin/sequences/Sequence;
+PLkotlin/sequences/TransformingSequence;->access$getTransformer$p(Lkotlin/sequences/TransformingSequence;)Lkotlin/jvm/functions/Function1;
+PLkotlin/sequences/TransformingSequence;->iterator()Ljava/util/Iterator;
+PLkotlin/sequences/TransformingSequence$iterator$1;-><init>(Lkotlin/sequences/TransformingSequence;)V
+PLkotlin/sequences/TransformingSequence$iterator$1;->hasNext()Z
+PLkotlin/sequences/TransformingSequence$iterator$1;->next()Ljava/lang/Object;
+PLkotlin/text/CharsKt__CharJVMKt;->isWhitespace(C)Z
+PLkotlin/text/DelimitedRangesSequence;-><init>(Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function2;)V
+PLkotlin/text/DelimitedRangesSequence;->access$getGetNextMatch$p(Lkotlin/text/DelimitedRangesSequence;)Lkotlin/jvm/functions/Function2;
+PLkotlin/text/DelimitedRangesSequence;->access$getInput$p(Lkotlin/text/DelimitedRangesSequence;)Ljava/lang/CharSequence;
+PLkotlin/text/DelimitedRangesSequence;->access$getLimit$p(Lkotlin/text/DelimitedRangesSequence;)I
+PLkotlin/text/DelimitedRangesSequence;->access$getStartIndex$p(Lkotlin/text/DelimitedRangesSequence;)I
+PLkotlin/text/DelimitedRangesSequence;->iterator()Ljava/util/Iterator;
+PLkotlin/text/DelimitedRangesSequence$iterator$1;-><init>(Lkotlin/text/DelimitedRangesSequence;)V
+PLkotlin/text/DelimitedRangesSequence$iterator$1;->calcNext()V
+PLkotlin/text/DelimitedRangesSequence$iterator$1;->hasNext()Z
+PLkotlin/text/DelimitedRangesSequence$iterator$1;->next()Ljava/lang/Object;
+PLkotlin/text/DelimitedRangesSequence$iterator$1;->next()Lkotlin/ranges/IntRange;
+PLkotlin/text/StringsKt__AppendableKt;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
+PLkotlin/text/StringsKt__IndentKt;->getIndentFunction$StringsKt__IndentKt(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+PLkotlin/text/StringsKt__IndentKt;->indentWidth$StringsKt__IndentKt(Ljava/lang/String;)I
+PLkotlin/text/StringsKt__IndentKt;->replaceIndent(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+PLkotlin/text/StringsKt__IndentKt;->trimIndent(Ljava/lang/String;)Ljava/lang/String;
+PLkotlin/text/StringsKt__IndentKt$getIndentFunction$1;-><clinit>()V
+PLkotlin/text/StringsKt__IndentKt$getIndentFunction$1;-><init>()V
+PLkotlin/text/StringsKt__IndentKt$getIndentFunction$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLkotlin/text/StringsKt__IndentKt$getIndentFunction$1;->invoke(Ljava/lang/String;)Ljava/lang/String;
+PLkotlin/text/StringsKt__StringsJVMKt;->isBlank(Ljava/lang/CharSequence;)Z
+PLkotlin/text/StringsKt__StringsJVMKt;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
+PLkotlin/text/StringsKt__StringsKt;->access$findAnyOf(Ljava/lang/CharSequence;Ljava/util/Collection;IZZ)Lkotlin/Pair;
+PLkotlin/text/StringsKt__StringsKt;->findAnyOf$StringsKt__StringsKt(Ljava/lang/CharSequence;Ljava/util/Collection;IZZ)Lkotlin/Pair;
+PLkotlin/text/StringsKt__StringsKt;->getIndices(Ljava/lang/CharSequence;)Lkotlin/ranges/IntRange;
+PLkotlin/text/StringsKt__StringsKt;->getLastIndex(Ljava/lang/CharSequence;)I
+PLkotlin/text/StringsKt__StringsKt;->lineSequence(Ljava/lang/CharSequence;)Lkotlin/sequences/Sequence;
+PLkotlin/text/StringsKt__StringsKt;->lines(Ljava/lang/CharSequence;)Ljava/util/List;
+PLkotlin/text/StringsKt__StringsKt;->rangesDelimitedBy$StringsKt__StringsKt$default(Ljava/lang/CharSequence;[Ljava/lang/String;IZIILjava/lang/Object;)Lkotlin/sequences/Sequence;
+PLkotlin/text/StringsKt__StringsKt;->rangesDelimitedBy$StringsKt__StringsKt(Ljava/lang/CharSequence;[Ljava/lang/String;IZI)Lkotlin/sequences/Sequence;
+PLkotlin/text/StringsKt__StringsKt;->requireNonNegativeLimit(I)V
+PLkotlin/text/StringsKt__StringsKt;->splitToSequence$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZIILjava/lang/Object;)Lkotlin/sequences/Sequence;
+PLkotlin/text/StringsKt__StringsKt;->splitToSequence(Ljava/lang/CharSequence;[Ljava/lang/String;ZI)Lkotlin/sequences/Sequence;
+PLkotlin/text/StringsKt__StringsKt;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
+PLkotlin/text/StringsKt__StringsKt$rangesDelimitedBy$2;-><init>(Ljava/util/List;Z)V
+PLkotlin/text/StringsKt__StringsKt$rangesDelimitedBy$2;->invoke(Ljava/lang/CharSequence;I)Lkotlin/Pair;
+PLkotlin/text/StringsKt__StringsKt$rangesDelimitedBy$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+PLkotlin/text/StringsKt__StringsKt$splitToSequence$1;-><init>(Ljava/lang/CharSequence;)V
+PLkotlin/text/StringsKt__StringsKt$splitToSequence$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLkotlin/text/StringsKt__StringsKt$splitToSequence$1;->invoke(Lkotlin/ranges/IntRange;)Ljava/lang/String;
+PLkotlin/text/StringsKt___StringsKt;->drop(Ljava/lang/String;I)Ljava/lang/String;
\ No newline at end of file
diff --git a/benchmark/integration-tests/baselineprofile-test-utils/utils.gradle b/benchmark/integration-tests/baselineprofile-test-utils/utils.gradle
index b8a42a7..1ec437f 100644
--- a/benchmark/integration-tests/baselineprofile-test-utils/utils.gradle
+++ b/benchmark/integration-tests/baselineprofile-test-utils/utils.gradle
@@ -1,4 +1,3 @@
-import com.android.build.api.artifact.SingleArtifact
import org.gradle.work.DisableCachingByDefault
import static androidx.baselineprofile.gradle.utils.UtilsKt.camelCase
@@ -21,14 +20,23 @@
@TaskAction
void exec() {
+ File expectedFile = getExpectedFile().get().asFile
File actualFile = new File(actualFilePath.get())
+
+ if (!expectedFile.exists() && actualFile.exists()) {
+ throw new GradleException("No profile was expected in ${actualFile.absolutePath}.")
+ }
+ if (expectedFile.exists() && !actualFile.exists()) {
+ throw new GradleException("A profile was expected in ${actualFile.absolutePath}.")
+ }
+
if (!actualFile.exists()) {
throw new GradleException(
- "A baseline profile was expected in ${actualFile.absolutePath}."
+ "A profile was expected in ${actualFile.absolutePath}."
)
}
- def expectedIter = getExpectedFile().get().asFile.text.lines().iterator()
+ def expectedIter = expectedFile.text.lines().iterator()
def actualIter = actualFile.text.lines().iterator()
def lineCounter = 0
@@ -43,11 +51,9 @@
}
if (!diff.isEmpty()) {
- logger.error("Actual generated baseline profile differs from expected one: \n\t"
+ logger.error("Actual generated profile differs from expected one: \n\t"
+ diff.join("\n\t"))
- throw new GradleException(
- "Actual generated baseline profile differs from expected one."
- )
+ throw new GradleException("Actual generated profile differs from expected one.")
}
// This deletes the actual file since it's a test artifact
@@ -59,14 +65,20 @@
// present and have the same content.
def testTaskProviders = []
-def registerAssertTask(ArrayList<TaskProvider<Task>> testTaskProviders, String variantName) {
+def registerAssertTask(
+ ArrayList<TaskProvider<Task>> testTaskProviders,
+ String variantName,
+ String taskName,
+ String expectedFilename,
+ String filename
+) {
def expectedBaselineProfileSubDir = "generated/baselineProfiles"
def expectedFile = project
.layout
.projectDirectory
- .file("src/$variantName/$expectedBaselineProfileSubDir/expected-baseline-prof.txt")
+ .file("src/$variantName/$expectedBaselineProfileSubDir/${expectedFilename}.txt")
// If there is no expected file then skip testing this variant.
if (!expectedFile.asFile.exists()) {
@@ -74,14 +86,14 @@
}
def taskProvider = project.tasks.register(
- camelCase("test", variantName, "baselineProfileGeneration"),
+ camelCase("test", variantName, "${taskName}Generation"),
AssertEqualsAndCleanUpTask
) {
it.expectedFile.set(expectedFile)
it.actualFilePath.set(project
.layout
.projectDirectory
- .file("src/$variantName/$expectedBaselineProfileSubDir/baseline-prof.txt")
+ .file("src/$variantName/$expectedBaselineProfileSubDir/${filename}.txt")
.getAsFile()
.absolutePath)
@@ -95,7 +107,20 @@
// An assert task is defined per variant
androidComponents {
onVariants(selector().all()) { variant ->
- registerAssertTask(testTaskProviders, variant.name)
+ registerAssertTask(
+ testTaskProviders,
+ variant.name,
+ "baselineProfile",
+ "expected-baseline-prof",
+ "baseline-prof"
+ )
+ registerAssertTask(
+ testTaskProviders,
+ variant.name,
+ "startupProfile",
+ "expected-startup-prof",
+ "startup-prof"
+ )
}
}
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt b/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
index 03b36dc..753d7bc 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
@@ -231,9 +231,6 @@
// Disable until ag/19949626 goes in (b/261918265)
disable.add("MissingQuantity")
- // Disable new lint check so that we can land incrementally.
- disable.add("VisibleForTests")
-
// Provide stricter enforcement for project types intended to run on a device.
if (extension.type.compilationTarget == CompilationTarget.DEVICE) {
fatal.add("Assert")
diff --git a/buildSrc/shared-dependencies.gradle b/buildSrc/shared-dependencies.gradle
index 1b67981..0625be3 100644
--- a/buildSrc/shared-dependencies.gradle
+++ b/buildSrc/shared-dependencies.gradle
@@ -6,6 +6,8 @@
// Gradle APIs
implementation(gradleApi())
compileOnly(findGradleKotlinDsl())
+ //noinspection UseTomlInstead,GradleDependency
+ implementation("com.android.tools:r8:8.1.41") // Temporary workaround for b/279807477
// Android Gradle Plugin APIs used by Stable AIDL
implementation(libs.androidGradlePluginApi)
diff --git a/compose/foundation/foundation/api/current.txt b/compose/foundation/foundation/api/current.txt
index f59ada3..7a258fb 100644
--- a/compose/foundation/foundation/api/current.txt
+++ b/compose/foundation/foundation/api/current.txt
@@ -867,9 +867,7 @@
public final class BasicTextKt {
method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional androidx.compose.ui.graphics.ColorLambda? color);
- method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional androidx.compose.ui.graphics.ColorLambda? color);
- method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,? extends androidx.compose.foundation.text.InlineTextContent> inlineContent);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines);
diff --git a/compose/foundation/foundation/api/public_plus_experimental_current.txt b/compose/foundation/foundation/api/public_plus_experimental_current.txt
index c959cca..c3d23b0 100644
--- a/compose/foundation/foundation/api/public_plus_experimental_current.txt
+++ b/compose/foundation/foundation/api/public_plus_experimental_current.txt
@@ -1215,9 +1215,7 @@
public final class BasicTextKt {
method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional androidx.compose.ui.graphics.ColorLambda? color);
- method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional androidx.compose.ui.graphics.ColorLambda? color);
- method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,? extends androidx.compose.foundation.text.InlineTextContent> inlineContent);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines);
diff --git a/compose/foundation/foundation/api/restricted_current.txt b/compose/foundation/foundation/api/restricted_current.txt
index f59ada3..7a258fb 100644
--- a/compose/foundation/foundation/api/restricted_current.txt
+++ b/compose/foundation/foundation/api/restricted_current.txt
@@ -867,9 +867,7 @@
public final class BasicTextKt {
method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional androidx.compose.ui.graphics.ColorLambda? color);
- method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional androidx.compose.ui.graphics.ColorLambda? color);
- method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,? extends androidx.compose.foundation.text.InlineTextContent> inlineContent);
method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines);
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextAnimationDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextAnimationDemo.kt
index 347098b..1f7432f 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextAnimationDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextAnimationDemo.kt
@@ -45,8 +45,6 @@
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.text.ExperimentalTextApi
@@ -84,11 +82,7 @@
initialValue = Color.Black,
targetValue = Color.Gray,
animationSpec = InfiniteRepeatableSpec(
- tween(
- 5_000,
- 50,
- CubicBezierEasing(0.2f, 0.0f, 0.5f, 0.6f)
- ),
+ tween(5_000, 50, CubicBezierEasing(0.2f, 0.0f, 0.5f, 0.6f)),
repeatMode = RepeatMode.Reverse
),
label = "slow gray"
@@ -115,38 +109,6 @@
}
}
-@Composable
-fun TextGradientAnimation() {
- val anim = rememberInfiniteTransition("gradient")
- val offset = anim.animateFloat(
- initialValue = 0.0f,
- targetValue = 0.8f,
- animationSpec = InfiniteRepeatableSpec(
- animation = tween(
- durationMillis = 4000,
- delayMillis = 500,
- easing = CubicBezierEasing(0.2f, 0.0f, 0.5f, 1.0f)
- ),
- repeatMode = RepeatMode.Reverse),
- label = "offset"
- )
-
- Box(contentAlignment = Alignment.Center) {
- BasicText(
- "Search Light",
- style = TextStyle.Default.copy(fontSize = 45.sp, textAlign = TextAlign.Center),
- brush = {
- Brush.radialGradient(
- offset.value + 0.2f to Color.LightGray, /* grow and sharpen */
- offset.value + 0.8f to Color.Black,
- center = Offset(600f * offset.value, 100f)
- )
- },
- alpha = { 1.0f }
- )
- }
-}
-
class TextMotionState(initialTextStyle: TextStyle) {
var isStatic by mutableStateOf(true)
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt
index 4ccb221..d48487a 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt
@@ -34,8 +34,7 @@
DemoCategory(
"Animation",
listOf(
- ComposableDemo("color = { animated.value }") { TextColorAnimation() },
- ComposableDemo("gradient = { animated.value } ") { TextGradientAnimation() },
+ ComposableDemo("color = { animatedColor.value }") { TextColorAnimation() },
ComposableDemo("GraphicsLayer (skew, scale, etc)") { TextAnimationDemo() },
)
),
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/NodeInvalidationTestParent.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/NodeInvalidationTestParent.kt
index efc06d7..9f59f41 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/NodeInvalidationTestParent.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/NodeInvalidationTestParent.kt
@@ -19,6 +19,7 @@
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorLambda
+import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.createFontFamilyResolver
@@ -65,31 +66,7 @@
assertThat(drawChanged).isTrue()
}
- @Test
- fun brushChanged_usingLambda_doesInvalidateDraw() {
- val params = generateParams()
- val redFactory = { Brush.linearGradient(listOf(Color.Red)) }
- val blueFactory = { Brush.linearGradient(listOf(Color.Blue)) }
- val alpha = { 1.0f }
- val drawParams = DrawParams(params.style, null, redFactory, alpha)
- val subject = createSubject(params, drawParams)
- val drawChanged = subject.updateDrawArgs(drawParams.copy(brush = blueFactory))
- assertThat(drawChanged).isTrue()
- }
-
- @Test
- fun brushChanged_usingStyle_doesInvalidateDraw() {
- val params = generateParams()
- val drawParams = DrawParams(params.style, null, null, null)
- val subject = createSubject(params, drawParams)
- val drawChanged = subject.updateDrawArgs(
- drawParams = drawParams.copy(
- style = drawParams.style.copy(brush = Brush.linearGradient(listOf(Color.Blue)))
- )
- )
- assertThat(drawChanged).isTrue()
- }
-
+ @OptIn(ExperimentalTextApi::class)
@Test
fun brushChange_doesNotInvalidateLayout() {
val params = generateParams()
@@ -196,7 +173,7 @@
data class DrawParams(
val style: TextStyle,
val color: ColorLambda? = null,
- val brush: (() -> Brush)? = null,
- val alpha: (() -> Float)? = null
+ val brush: Brush? = null,
+ val alpha: Float = Float.NaN
)
}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNodeInvalidationTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNodeInvalidationTest.kt
index 227fe8e..401c40a 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNodeInvalidationTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNodeInvalidationTest.kt
@@ -34,12 +34,7 @@
override fun Any.updateDrawArgs(drawParams: DrawParams): Boolean {
this as TextAnnotatedStringNode
- return updateDraw(
- drawParams.color,
- drawParams.brush,
- drawParams.alpha,
- drawParams.style
- )
+ return updateDraw(drawParams.color, drawParams.style)
}
override fun createSubject(params: Params): Any {
@@ -51,7 +46,7 @@
overflow = params.overflow,
softWrap = params.softWrap,
maxLines = params.maxLines,
- minLines = params.minLines,
+ minLines = params.minLines
)
}
@@ -65,9 +60,7 @@
softWrap = params.softWrap,
maxLines = params.maxLines,
minLines = params.minLines,
- overrideColor = drawParams.color,
- overrideBrush = drawParams.brush,
- overrideAlpha = drawParams.alpha
+ overrideColor = drawParams.color
)
}
}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNodeInvalidationTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNodeInvalidationTest.kt
index d35be68..a1adb5f 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNodeInvalidationTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNodeInvalidationTest.kt
@@ -19,12 +19,7 @@
class TextStringSimpleNodeInvalidationTest : NodeInvalidationTestParent() {
override fun Any.updateDrawArgs(drawParams: DrawParams): Boolean {
this as TextStringSimpleNode
- return this.updateDraw(
- drawParams.color,
- drawParams.brush,
- drawParams.alpha,
- drawParams.style
- )
+ return this.updateDraw(drawParams.color, drawParams.style)
}
override fun Any.updateAll(params: Params): Pair<Boolean, Boolean> {
@@ -47,7 +42,7 @@
params.overflow,
params.softWrap,
params.maxLines,
- params.minLines,
+ params.minLines
)
}
@@ -60,9 +55,7 @@
params.softWrap,
params.maxLines,
params.minLines,
- drawParams.color,
- drawParams.brush,
- drawParams.alpha
+ drawParams.color
)
}
}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicText.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicText.kt
index 1a72c7c..4deb104 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicText.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicText.kt
@@ -32,7 +32,6 @@
import androidx.compose.runtime.saveable.Saver
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.ColorLambda
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.Layout
@@ -49,7 +48,6 @@
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.FloatLambda
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.util.fastForEach
import kotlin.math.floor
@@ -122,9 +120,7 @@
placeholders = null,
>
selectionController = selectionController,
- color = color,
- brush = null,
- alpha = null
+ color = color
)
} else {
modifier
@@ -137,101 +133,7 @@
softWrap = softWrap,
maxLines = maxLines,
minLines = minLines,
- color = color,
- brush = null,
- alpha = null
- )
- }
- Layout(finalModifier, EmptyMeasurePolicy)
-}
-
-/**
- * Basic element that displays text and provides semantics / accessibility information.
- * Typically you will instead want to use [androidx.compose.material.Text], which is
- * a higher level Text element that contains semantics and consumes style information from a theme.
- *
- * @param text The text to be displayed.
- * @param modifier [Modifier] to apply to this layout node.
- * @param style Style configuration for the text such as color, font, line height etc.
- * @param onTextLayout Callback that is executed when a new text layout is calculated. A
- * [TextLayoutResult] object that callback provides contains paragraph information, size of the
- * text, baselines and other details. The callback can be used to add additional decoration or
- * functionality to the text. For example, to draw selection around the text.
- * @param overflow How visual overflow should be handled.
- * @param softWrap Whether the text should break at soft line breaks. If false, the glyphs in the
- * text will be positioned as if there was unlimited horizontal space. If [softWrap] is false,
- * [overflow] and TextAlign may have unexpected effects.
- * @param maxLines An optional maximum number of lines for the text to span, wrapping if
- * necessary. If the text exceeds the given number of lines, it will be truncated according to
- * [overflow] and [softWrap]. It is required that 1 <= [minLines] <= [maxLines].
- * @param minLines The minimum height in terms of minimum number of visible lines. It is required
- * that 1 <= [minLines] <= [maxLines].
- * @param brush Overrides the brush provided in [style]
- * @param alpha Overrides the brush alpha provided in [style]
- */
-@Composable
-fun BasicText(
- text: String,
- modifier: Modifier = Modifier,
- style: TextStyle = TextStyle.Default,
- onTextLayout: ((TextLayoutResult) -> Unit)? = null,
- overflow: TextOverflow = TextOverflow.Clip,
- softWrap: Boolean = true,
- maxLines: Int = Int.MAX_VALUE,
- minLines: Int = 1,
- brush: (() -> Brush)? = null,
- alpha: FloatLambda? = null
-) {
- validateMinMaxLines(
- minLines = minLines,
- maxLines = maxLines
- )
- val selectionRegistrar = LocalSelectionRegistrar.current
- val selectionController = if (selectionRegistrar != null) {
- val backgroundSelectionColor = LocalTextSelectionColors.current.backgroundColor
- remember(selectionRegistrar, backgroundSelectionColor) {
- SelectionController(
- selectionRegistrar,
- backgroundSelectionColor
- )
- }
- } else {
- null
- }
- val finalModifier = if (selectionController != null || onTextLayout != null) {
- modifier
- // TODO(b/274781644): Remove this graphicsLayer
- .graphicsLayer()
- .textModifier(
- AnnotatedString(text = text),
- style = style,
- >
- overflow = overflow,
- softWrap = softWrap,
- maxLines = maxLines,
- minLines = minLines,
- fontFamilyResolver = LocalFontFamilyResolver.current,
- placeholders = null,
- >
- selectionController = selectionController,
- color = null,
- brush = brush,
- alpha = alpha
- )
- } else {
- modifier
- // TODO(b/274781644): Remove this graphicsLayer
- .graphicsLayer() then TextStringSimpleElement(
- text = text,
- style = style,
- fontFamilyResolver = LocalFontFamilyResolver.current,
- overflow = overflow,
- softWrap = softWrap,
- maxLines = maxLines,
- minLines = minLines,
- color = null,
- brush = brush,
- alpha = alpha
+ color = color
)
}
Layout(finalModifier, EmptyMeasurePolicy)
@@ -309,9 +211,7 @@
placeholders = null,
>
selectionController = selectionController,
- color = color,
- brush = null,
- alpha = null
+ color = color
),
EmptyMeasurePolicy
)
@@ -340,129 +240,13 @@
placeholders = placeholders,
measuredPlaceholderPositions.value = it },
selectionController = selectionController,
- color = color,
- brush = null,
- alpha = null
+ color = color
),
measurePolicy = TextMeasurePolicy { measuredPlaceholderPositions.value }
)
}
}
-/**
- * Basic element that displays text and provides semantics / accessibility information.
- * Typically you will instead want to use [androidx.compose.material.Text], which is
- * a higher level Text element that contains semantics and consumes style information from a theme.
- *
- * @param text The text to be displayed.
- * @param modifier [Modifier] to apply to this layout node.
- * @param style Style configuration for the text such as color, font, line height etc.
- * @param onTextLayout Callback that is executed when a new text layout is calculated. A
- * [TextLayoutResult] object that callback provides contains paragraph information, size of the
- * text, baselines and other details. The callback can be used to add additional decoration or
- * functionality to the text. For example, to draw selection around the text.
- * @param overflow How visual overflow should be handled.
- * @param softWrap Whether the text should break at soft line breaks. If false, the glyphs in the
- * text will be positioned as if there was unlimited horizontal space. If [softWrap] is false,
- * [overflow] and TextAlign may have unexpected effects.
- * @param maxLines An optional maximum number of lines for the text to span, wrapping if
- * necessary. If the text exceeds the given number of lines, it will be truncated according to
- * [overflow] and [softWrap]. It is required that 1 <= [minLines] <= [maxLines].
- * @param minLines The minimum height in terms of minimum number of visible lines. It is required
- * that 1 <= [minLines] <= [maxLines].
- * @param inlineContent A map store composables that replaces certain ranges of the text. It's
- * used to insert composables into text layout. Check [InlineTextContent] for more information.
- * @param brush Overrides the brush provided in [style]
- * @param alpha Overrides the brush alpha provided in [style]
- */
-@Composable
-fun BasicText(
- text: AnnotatedString,
- modifier: Modifier = Modifier,
- style: TextStyle = TextStyle.Default,
- onTextLayout: ((TextLayoutResult) -> Unit)? = null,
- overflow: TextOverflow = TextOverflow.Clip,
- softWrap: Boolean = true,
- maxLines: Int = Int.MAX_VALUE,
- minLines: Int = 1,
- inlineContent: Map<String, InlineTextContent> = mapOf(),
- brush: (() -> Brush)? = null,
- alpha: FloatLambda? = null
-) {
- validateMinMaxLines(
- minLines = minLines,
- maxLines = maxLines
- )
- val selectionRegistrar = LocalSelectionRegistrar.current
- val selectionController = if (selectionRegistrar != null) {
- val backgroundSelectionColor = LocalTextSelectionColors.current.backgroundColor
- remember(selectionRegistrar, backgroundSelectionColor) {
- SelectionController(
- selectionRegistrar,
- backgroundSelectionColor
- )
- }
- } else {
- null
- }
- if (!text.hasInlineContent()) {
- // this is the same as text: String, use all the early exits
- Layout(
- modifier = modifier
- // TODO(b/274781644): Remove this graphicsLayer
- .graphicsLayer()
- .textModifier(
- text = text,
- style = style,
- >
- overflow = overflow,
- softWrap = softWrap,
- maxLines = maxLines,
- minLines = minLines,
- fontFamilyResolver = LocalFontFamilyResolver.current,
- placeholders = null,
- >
- selectionController = selectionController,
- color = null,
- brush = brush,
- alpha = alpha
- ),
- EmptyMeasurePolicy
- )
- } else {
- // do the inline content allocs
- val (placeholders, inlineComposables) = text.resolveInlineContent(
- inlineContent = inlineContent
- )
- val measuredPlaceholderPositions = remember<MutableState<List<Rect?>?>> {
- mutableStateOf(null)
- }
- Layout(
- content = { InlineChildren(text = text, inlineContents = inlineComposables) },
- modifier = modifier
- // TODO(b/274781644): Remove this graphicsLayer
- .graphicsLayer()
- .textModifier(
- text = text,
- style = style,
- >
- overflow = overflow,
- softWrap = softWrap,
- maxLines = maxLines,
- minLines = minLines,
- fontFamilyResolver = LocalFontFamilyResolver.current,
- placeholders = placeholders,
- measuredPlaceholderPositions.value = it },
- selectionController = selectionController,
- color = null,
- brush = brush,
- alpha = alpha
- ),
- measurePolicy = TextMeasurePolicy { measuredPlaceholderPositions.value }
- )
- }
-}
-
@Deprecated("Maintained for binary compatibility", level = DeprecationLevel.HIDDEN)
@Composable
fun BasicText(
@@ -613,9 +397,7 @@
placeholders: List<AnnotatedString.Range<Placeholder>>?,
onPlaceholderLayout: ((List<Rect?>) -> Unit)?,
selectionController: SelectionController?,
- color: ColorLambda?,
- brush: (() -> Brush)?,
- alpha: FloatLambda?
+ color: ColorLambda?
): Modifier {
if (selectionController == null) {
val staticTextModifier = TextAnnotatedStringElement(
@@ -630,9 +412,7 @@
placeholders,
onPlaceholderLayout,
null,
- color,
- brush,
- alpha
+ color
)
return this then Modifier /* selection position */ then staticTextModifier
} else {
@@ -648,9 +428,7 @@
placeholders,
onPlaceholderLayout,
selectionController,
- color,
- brush,
- alpha
+ color
)
return this then selectionController.modifier then selectableTextModifier
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringElement.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringElement.kt
index 7670002..1731650 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringElement.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringElement.kt
@@ -18,7 +18,6 @@
import androidx.compose.foundation.text.DefaultMinLines
import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.ColorLambda
import androidx.compose.ui.node.ModifierNodeElement
import androidx.compose.ui.platform.InspectorInfo
@@ -28,7 +27,6 @@
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.FloatLambda
/**
* Element for any text that is in a selection container.
@@ -45,9 +43,7 @@
private val placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
private val onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
private val selectionController: SelectionController? = null,
- private val color: ColorLambda? = null,
- private val brush: (() -> Brush)? = null,
- private val alpha: FloatLambda? = null
+ private val color: ColorLambda? = null
) : ModifierNodeElement<SelectableTextAnnotatedStringNode>() {
override fun create(): SelectableTextAnnotatedStringNode = SelectableTextAnnotatedStringNode(
@@ -62,9 +58,7 @@
placeholders,
onPlaceholderLayout,
selectionController,
- color,
- brush,
- alpha
+ color
)
override fun update(
@@ -82,9 +76,7 @@
>
>
selectionController = selectionController,
- color = color,
- brush = brush,
- alpha = alpha
+ color = color
)
}
@@ -95,8 +87,6 @@
// these three are most likely to actually change
if (color != other.color) return false
- if (brush != other.brush) return false
- if (alpha != other.alpha) return false
if (text != other.text) return false
if (style != other.style) return false
if (placeholders != other.placeholders) return false
@@ -129,8 +119,6 @@
result = 31 * result + (onPlaceholderLayout?.hashCode() ?: 0)
result = 31 * result + (selectionController?.hashCode() ?: 0)
result = 31 * result + (color?.hashCode() ?: 0)
- result = 31 * result + (brush?.hashCode() ?: 0)
- result = 31 * result + (alpha?.hashCode() ?: 0)
return result
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringNode.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringNode.kt
index 6ced651..1a2a9f2 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringNode.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/SelectableTextAnnotatedStringNode.kt
@@ -18,7 +18,6 @@
import androidx.compose.foundation.text.DefaultMinLines
import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.ColorLambda
import androidx.compose.ui.graphics.drawscope.ContentDrawScope
import androidx.compose.ui.layout.IntrinsicMeasurable
@@ -41,7 +40,6 @@
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.FloatLambda
/**
* Node for any text that is in a selection container.
@@ -60,9 +58,7 @@
placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
private val selectionController: SelectionController? = null,
- overrideColor: ColorLambda? = null,
- brush: (() -> Brush)? = null,
- alpha: FloatLambda? = null,
+ overrideColor: ColorLambda? = null
) : DelegatingNode(), LayoutModifierNode, DrawModifierNode, GlobalPositionAwareModifierNode,
SemanticsModifierNode {
@@ -79,9 +75,7 @@
placeholders = placeholders,
>
selectionController = selectionController,
- overrideColor = overrideColor,
- overrideBrush = brush,
- overrideAlpha = alpha
+ overrideColor = overrideColor
)
)
@@ -137,12 +131,10 @@
onTextLayout: ((TextLayoutResult) -> Unit)?,
onPlaceholderLayout: ((List<Rect?>) -> Unit)?,
selectionController: SelectionController?,
- color: ColorLambda?,
- brush: (() -> Brush)?,
- alpha: FloatLambda?
+ color: ColorLambda?
) {
delegate.doInvalidations(
- drawChanged = delegate.updateDraw(color, brush, alpha, style),
+ drawChanged = delegate.updateDraw(color, style),
textChanged = delegate.updateText(
text = text
),
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringElement.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringElement.kt
index 3058dfa..9411391 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringElement.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringElement.kt
@@ -18,7 +18,6 @@
import androidx.compose.foundation.text.DefaultMinLines
import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.ColorLambda
import androidx.compose.ui.node.ModifierNodeElement
import androidx.compose.ui.platform.InspectorInfo
@@ -28,7 +27,6 @@
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.FloatLambda
/**
* Modifier element for any Text with [AnnotatedString] or [onTextLayout] parameters
@@ -47,9 +45,7 @@
private val placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
private val onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
private val selectionController: SelectionController? = null,
- private val color: ColorLambda? = null,
- private val brush: (() -> Brush)? = null,
- private val alpha: FloatLambda? = null,
+ private val color: ColorLambda? = null
) : ModifierNodeElement<TextAnnotatedStringNode>() {
override fun create(): TextAnnotatedStringNode = TextAnnotatedStringNode(
@@ -64,14 +60,12 @@
placeholders,
onPlaceholderLayout,
selectionController,
- color,
- brush,
- alpha
+ color
)
override fun update(node: TextAnnotatedStringNode) {
node.doInvalidations(
- drawChanged = node.updateDraw(color, brush, alpha, style),
+ drawChanged = node.updateDraw(color, style),
textChanged = node.updateText(
text = text
),
@@ -99,8 +93,6 @@
// these three are most likely to actually change
if (color != other.color) return false
- if (brush != other.brush) return false
- if (alpha != other.alpha) return false
if (text != other.text) return false /* expensive to check, do it after color */
if (style != other.style) return false
if (placeholders != other.placeholders) return false
@@ -133,8 +125,6 @@
result = 31 * result + (onPlaceholderLayout?.hashCode() ?: 0)
result = 31 * result + (selectionController?.hashCode() ?: 0)
result = 31 * result + (color?.hashCode() ?: 0)
- result = 31 * result + (brush?.hashCode() ?: 0)
- result = 31 * result + (alpha?.hashCode() ?: 0)
return result
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNode.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNode.kt
index 3b8c25a..4135dbe 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNode.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNode.kt
@@ -21,7 +21,6 @@
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorLambda
import androidx.compose.ui.graphics.Shadow
@@ -56,7 +55,6 @@
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.FloatLambda
import kotlin.math.roundToInt
/**
@@ -74,9 +72,7 @@
private var placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
private var onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
private var selectionController: SelectionController? = null,
- private var overrideColor: ColorLambda? = null,
- private var overrideBrush: (() -> Brush)? = null,
- private var overrideAlpha: FloatLambda? = null
+ private var overrideColor: ColorLambda? = null
) : Modifier.Node(), LayoutModifierNode, DrawModifierNode, SemanticsModifierNode {
private var baselineCache: Map<AlignmentLine, Int>? = null
@@ -105,24 +101,11 @@
/**
* Element has draw parameters to update
*/
- fun updateDraw(
- color: ColorLambda?,
- brush: (() -> Brush)?,
- alpha: FloatLambda?,
- style: TextStyle
- ): Boolean {
+ fun updateDraw(color: ColorLambda?, style: TextStyle): Boolean {
var changed = false
if (color != this.overrideColor) {
changed = true
}
- if (brush !== this.overrideBrush) {
- changed = true
- }
- if (brush != null && alpha != this.overrideAlpha) {
- changed = true
- }
- overrideBrush = brush
- overrideAlpha = alpha
overrideColor = color
changed = changed || !style.hasSameDrawAffectingAttributes(this.style)
return changed
@@ -406,16 +389,9 @@
val textDecoration = style.textDecoration ?: TextDecoration.None
val shadow = style.shadow ?: Shadow.None
val drawStyle = style.drawStyle ?: Fill
- val brush = overrideBrush?.invoke() ?: style.brush
+ val brush = style.brush
if (brush != null) {
- val localAlpha = overrideAlpha
- @Suppress("IfThenToElvis") // boxing
- val localAlphaResolved = if (localAlpha != null) {
- localAlpha.invoke()
- } else {
- Float.NaN
- }
- val alpha = if (!localAlphaResolved.isNaN()) localAlphaResolved else style.alpha
+ val alpha = style.alpha
localParagraph.paint(
canvas = canvas,
brush = brush,
@@ -425,13 +401,7 @@
decoration = textDecoration
)
} else {
- val localColorOverride = overrideColor
- @Suppress("IfThenToElvis") // don't box that Color
- val overrideColorVal = if (localColorOverride != null) {
- localColorOverride.invoke()
- } else {
- Color.Unspecified
- }
+ val overrideColorVal = overrideColor?.invoke() ?: Color.Unspecified
val color = if (overrideColorVal.isSpecified) {
overrideColorVal
} else if (style.color.isSpecified) {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleElement.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleElement.kt
index 3d9da8f..86f2b45 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleElement.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleElement.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.text.modifiers
import androidx.compose.foundation.text.DefaultMinLines
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.ColorLambda
import androidx.compose.ui.node.ModifierNodeElement
import androidx.compose.ui.platform.InspectorInfo
@@ -25,7 +24,6 @@
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.FloatLambda
/**
* Modifier element for any Text with [AnnotatedString] or [onTextLayout] parameters
@@ -40,9 +38,7 @@
private val softWrap: Boolean = true,
private val maxLines: Int = Int.MAX_VALUE,
private val minLines: Int = DefaultMinLines,
- private val color: ColorLambda? = null,
- private val brush: (() -> Brush)? = null,
- private val alpha: FloatLambda? = null,
+ private val color: ColorLambda? = null
) : ModifierNodeElement<TextStringSimpleNode>() {
override fun create(): TextStringSimpleNode = TextStringSimpleNode(
@@ -53,17 +49,13 @@
softWrap,
maxLines,
minLines,
- color,
- brush,
- alpha
+ color
)
override fun update(node: TextStringSimpleNode) {
node.doInvalidations(
drawChanged = node.updateDraw(
color,
- brush,
- alpha,
style
),
textChanged = node.updateText(
@@ -87,8 +79,6 @@
// these three are most likely to actually change
if (color != other.color) return false
- if (brush != other.brush) return false
- if (alpha != other.alpha) return false
if (text != other.text) return false /* expensive to check, do after color */
if (style != other.style) return false
@@ -111,8 +101,6 @@
result = 31 * result + maxLines
result = 31 * result + minLines
result = 31 * result + (color?.hashCode() ?: 0)
- result = 31 * result + (brush?.hashCode() ?: 0)
- result = 31 * result + (alpha?.hashCode() ?: 0)
return result
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt
index faf3770..bde635b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt
@@ -21,7 +21,6 @@
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorLambda
import androidx.compose.ui.graphics.Shadow
@@ -55,7 +54,6 @@
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.FloatLambda
import kotlin.math.roundToInt
/**
@@ -73,9 +71,7 @@
private var softWrap: Boolean = true,
private var maxLines: Int = Int.MAX_VALUE,
private var minLines: Int = DefaultMinLines,
- private var overrideColor: ColorLambda? = null,
- private var overrideBrush: (() -> Brush)? = null,
- private var overrideAlpha: FloatLambda? = null
+ private var overrideColor: ColorLambda? = null
) : Modifier.Node(), LayoutModifierNode, DrawModifierNode, SemanticsModifierNode {
private var baselineCache: Map<AlignmentLine, Int>? = null
@@ -100,24 +96,11 @@
return layoutCache.also { it.density = density }
}
- fun updateDraw(
- color: ColorLambda?,
- brush: (() -> Brush)?,
- alpha: FloatLambda?,
- style: TextStyle
- ): Boolean {
+ fun updateDraw(color: ColorLambda?, style: TextStyle): Boolean {
var changed = false
if (color != this.overrideColor) {
changed = true
}
- if (brush !== this.overrideBrush) {
- changed = true
- }
- if (brush != null && alpha != this.overrideAlpha) {
- changed = true
- }
- overrideBrush = brush
- overrideAlpha = alpha
overrideColor = color
changed = changed || !style.hasSameDrawAffectingAttributes(this.style)
return changed
@@ -322,32 +305,19 @@
val textDecoration = style.textDecoration ?: TextDecoration.None
val shadow = style.shadow ?: Shadow.None
val drawStyle = style.drawStyle ?: Fill
- val brush = overrideBrush?.invoke() ?: style.brush
+ val brush = style.brush
if (brush != null) {
- val localAlpha = overrideAlpha
- @Suppress("IfThenToElvis") // boxing
- val localAlphaResolved = if (localAlpha != null) {
- localAlpha.invoke()
- } else {
- Float.NaN
- }
- val alpha = if (!localAlphaResolved.isNaN()) localAlphaResolved else style.alpha
+ val alpha = style.alpha
localParagraph.paint(
- alpha = alpha,
- brush = brush,
canvas = canvas,
+ brush = brush,
+ alpha = alpha,
shadow = shadow,
drawStyle = drawStyle,
textDecoration = textDecoration
)
} else {
- val localColorOverride = overrideColor
- @Suppress("IfThenToElvis") // don't box that Color
- val overrideColorVal = if (localColorOverride != null) {
- localColorOverride.invoke()
- } else {
- Color.Unspecified
- }
+ val overrideColorVal = overrideColor?.invoke() ?: Color.Unspecified
val color = if (overrideColorVal.isSpecified) {
overrideColorVal
} else if (style.color.isSpecified) {
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/BasicTextPaparazziTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/BasicTextPaparazziTest.kt
index 9533450..90c62ed 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/BasicTextPaparazziTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/BasicTextPaparazziTest.kt
@@ -29,7 +29,6 @@
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.text.AnnotatedString
@@ -52,7 +51,7 @@
@Test
fun colorChangingState_changesColor() {
paparazzi.snapshot {
- val color = remember { mutableStateOf(Color.Red) }
+ var color = remember { mutableStateOf(Color.Red) }
BasicText(
"ABCD",
color = { color.value }
@@ -66,7 +65,7 @@
@Test
fun colorChangingState_changesColor_annotatedString() {
paparazzi.snapshot {
- val color = remember { mutableStateOf(Color.Red) }
+ var color = remember { mutableStateOf(Color.Red) }
BasicText(
AnnotatedString("ABCD"),
color = { color.value }
@@ -78,26 +77,6 @@
}
@Test
- fun brushState_changesBrush() {
- paparazzi.snapshot {
- val brush = remember { mutableStateOf(Brush.linearGradient(listOf(Color.Gray))) }
- Column {
- BasicText(
- AnnotatedString("Annotated"),
- brush = { brush.value }
- )
- BasicText(
- "String",
- brush = { brush.value }
- )
- }
- SideEffect {
- brush.value = Brush.sweepGradient(listOf(Color.Gray, Color.Green, Color.Gray))
- }
- }
- }
-
- @Test
fun overflowEllipsis_doesEllipsis_whenInPreferredWrapContent() {
paparazzi.snapshot {
// b/275369323
diff --git a/compose/material3/material3/src/androidMain/kotlin/androidx/compose/material3/Strings.android.kt b/compose/material3/material3/src/androidMain/kotlin/androidx/compose/material3/Strings.android.kt
index 07394fc..6e5abef 100644
--- a/compose/material3/material3/src/androidMain/kotlin/androidx/compose/material3/Strings.android.kt
+++ b/compose/material3/material3/src/androidMain/kotlin/androidx/compose/material3/Strings.android.kt
@@ -38,8 +38,10 @@
Strings.SliderRangeStart -> resources.getString(R.string.range_start)
Strings.SliderRangeEnd -> resources.getString(R.string.range_end)
Strings.Dialog -> resources.getString(androidx.compose.material3.R.string.dialog)
- Strings.MenuExpanded -> resources.getString(androidx.compose.material3.R.string.expanded)
- Strings.MenuCollapsed -> resources.getString(androidx.compose.material3.R.string.collapsed)
+ Strings.MenuExpanded ->
+ resources.getString(androidx.compose.material3.R.string.m3c_dropdown_menu_expanded)
+ Strings.MenuCollapsed ->
+ resources.getString(androidx.compose.material3.R.string.m3c_dropdown_menu_collapsed)
Strings.SnackbarDismiss -> resources.getString(
androidx.compose.material3.R.string.snackbar_dismiss
)
diff --git a/compose/material3/material3/src/androidMain/res/values-af/strings.xml b/compose/material3/material3/src/androidMain/res/values-af/strings.xml
index beb91f8..90f818f 100644
--- a/compose/material3/material3/src/androidMain/res/values-af/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-af/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialoog"</string>
- <string name="expanded" msgid="5974471714631304645">"Uitgevou"</string>
- <string name="collapsed" msgid="5389587048670450460">"Ingevou"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Maak toe"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Soek"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Voorstelle hieronder"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-am/strings.xml b/compose/material3/material3/src/androidMain/res/values-am/strings.xml
index c8749d6..8bfdd31 100644
--- a/compose/material3/material3/src/androidMain/res/values-am/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-am/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"መገናኛ"</string>
- <string name="expanded" msgid="5974471714631304645">"ተዘርግቷል"</string>
- <string name="collapsed" msgid="5389587048670450460">"ተሰብስቧል"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"አሰናብት"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ፍለጋ"</string>
<string name="suggestions_available" msgid="7189888345201419934">"የአስተያየት ጥቆማዎች ከታች"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ar/strings.xml b/compose/material3/material3/src/androidMain/res/values-ar/strings.xml
index ae5ecc0..47fdb86 100644
--- a/compose/material3/material3/src/androidMain/res/values-ar/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ar/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"مربّع حوار"</string>
- <string name="expanded" msgid="5974471714631304645">"موسَّع"</string>
- <string name="collapsed" msgid="5389587048670450460">"مصغَّر"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"إغلاق"</string>
<string name="search_bar_search" msgid="6420018528474762666">"بحث"</string>
<string name="suggestions_available" msgid="7189888345201419934">"إليك الاقتراحات:"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-as/strings.xml b/compose/material3/material3/src/androidMain/res/values-as/strings.xml
index 7bd785c..93f5d40 100644
--- a/compose/material3/material3/src/androidMain/res/values-as/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-as/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ডায়ল’গ"</string>
- <string name="expanded" msgid="5974471714631304645">"বিস্তাৰ কৰা আছে"</string>
- <string name="collapsed" msgid="5389587048670450460">"সংকোচন কৰা আছে"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"অগ্ৰাহ্য কৰক"</string>
<string name="search_bar_search" msgid="6420018528474762666">"সন্ধান কৰক"</string>
<string name="suggestions_available" msgid="7189888345201419934">"তলত পৰামৰ্শ দেখুওৱা হৈছে"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-az/strings.xml b/compose/material3/material3/src/androidMain/res/values-az/strings.xml
index da185a0..d9d39b4 100644
--- a/compose/material3/material3/src/androidMain/res/values-az/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-az/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialoq"</string>
- <string name="expanded" msgid="5974471714631304645">"Genişləndirilib"</string>
- <string name="collapsed" msgid="5389587048670450460">"Yığcamlaşdırılıb"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Qapadın"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Axtarış"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Təkliflər aşağıdadır"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-b+sr+Latn/strings.xml b/compose/material3/material3/src/androidMain/res/values-b+sr+Latn/strings.xml
index be53fbf..ebb2c71 100644
--- a/compose/material3/material3/src/androidMain/res/values-b+sr+Latn/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-b+sr+Latn/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dijalog"</string>
- <string name="expanded" msgid="5974471714631304645">"Prošireno je"</string>
- <string name="collapsed" msgid="5389587048670450460">"Skupljeno je"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Odbacite"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Pretraga"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Predlozi su u nastavku"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-be/strings.xml b/compose/material3/material3/src/androidMain/res/values-be/strings.xml
index 78697c3..679d3fb 100644
--- a/compose/material3/material3/src/androidMain/res/values-be/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-be/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Дыялогавае акно"</string>
- <string name="expanded" msgid="5974471714631304645">"Разгорнута"</string>
- <string name="collapsed" msgid="5389587048670450460">"Згорнута"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Закрыць"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Пошук"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Прапановы ўнізе"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-bg/strings.xml b/compose/material3/material3/src/androidMain/res/values-bg/strings.xml
index 63b1abf..cc9fb00 100644
--- a/compose/material3/material3/src/androidMain/res/values-bg/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-bg/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Диалогов прозорец"</string>
- <string name="expanded" msgid="5974471714631304645">"Разгънато"</string>
- <string name="collapsed" msgid="5389587048670450460">"Свито"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Отхвърляне"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Търсене"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Предложенията са по-долу"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-bn/strings.xml b/compose/material3/material3/src/androidMain/res/values-bn/strings.xml
index 70935fe..3046ebb 100644
--- a/compose/material3/material3/src/androidMain/res/values-bn/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-bn/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ডায়ালগ বক্স"</string>
- <string name="expanded" msgid="5974471714631304645">"বড় করা হয়েছে"</string>
- <string name="collapsed" msgid="5389587048670450460">"আড়াল করা হয়েছে"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"বাতিল করুন"</string>
<string name="search_bar_search" msgid="6420018528474762666">"সার্চ করুন"</string>
<string name="suggestions_available" msgid="7189888345201419934">"নিচে দেওয়া সাজেশন"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-bs/strings.xml b/compose/material3/material3/src/androidMain/res/values-bs/strings.xml
index 26c35b0..475861c 100644
--- a/compose/material3/material3/src/androidMain/res/values-bs/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-bs/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dijaloški okvir"</string>
- <string name="expanded" msgid="5974471714631304645">"Prošireno"</string>
- <string name="collapsed" msgid="5389587048670450460">"Suženo"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Odbacivanje"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Pretraživanje"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Prijedlozi su u nastavku"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ca/strings.xml b/compose/material3/material3/src/androidMain/res/values-ca/strings.xml
index a694aaf..6cf0708 100644
--- a/compose/material3/material3/src/androidMain/res/values-ca/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ca/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Diàleg"</string>
- <string name="expanded" msgid="5974471714631304645">"S\'ha desplegat"</string>
- <string name="collapsed" msgid="5389587048670450460">"S\'ha replegat"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Ignora"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Cerca"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggeriments a continuació"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-cs/strings.xml b/compose/material3/material3/src/androidMain/res/values-cs/strings.xml
index a8ff6c0..6b7fcd4 100644
--- a/compose/material3/material3/src/androidMain/res/values-cs/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-cs/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogové okno"</string>
- <string name="expanded" msgid="5974471714631304645">"Rozbaleno"</string>
- <string name="collapsed" msgid="5389587048670450460">"Sbaleno"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Zavřít"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Hledat"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Návrh je níže"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-da/strings.xml b/compose/material3/material3/src/androidMain/res/values-da/strings.xml
index d87fd19..3126827 100644
--- a/compose/material3/material3/src/androidMain/res/values-da/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-da/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogboks"</string>
- <string name="expanded" msgid="5974471714631304645">"Udvidet"</string>
- <string name="collapsed" msgid="5389587048670450460">"Skjult"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Afvis"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Søg"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Forslag nedenfor"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-de/strings.xml b/compose/material3/material3/src/androidMain/res/values-de/strings.xml
index 4052a8f..df293dc 100644
--- a/compose/material3/material3/src/androidMain/res/values-de/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-de/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogfeld"</string>
- <string name="expanded" msgid="5974471714631304645">"Maximiert"</string>
- <string name="collapsed" msgid="5389587048670450460">"Minimiert"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Schließen"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Suchen"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Vorschläge unten"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-el/strings.xml b/compose/material3/material3/src/androidMain/res/values-el/strings.xml
index 06b90b8..22660e7 100644
--- a/compose/material3/material3/src/androidMain/res/values-el/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-el/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Παράθυρο διαλόγου"</string>
- <string name="expanded" msgid="5974471714631304645">"Ανεπτυγμένο"</string>
- <string name="collapsed" msgid="5389587048670450460">"Συμπτυγμένο"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Παράβλεψη"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Αναζήτηση"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Προτάσεις παρακάτω"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-en-rAU/strings.xml b/compose/material3/material3/src/androidMain/res/values-en-rAU/strings.xml
index 7eef271..1dee3c2 100644
--- a/compose/material3/material3/src/androidMain/res/values-en-rAU/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-en-rAU/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogue"</string>
- <string name="expanded" msgid="5974471714631304645">"Expanded"</string>
- <string name="collapsed" msgid="5389587048670450460">"Collapsed"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Dismiss"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Search"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggestions below"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-en-rCA/strings.xml b/compose/material3/material3/src/androidMain/res/values-en-rCA/strings.xml
index 04a4e1d..55e3c2c 100644
--- a/compose/material3/material3/src/androidMain/res/values-en-rCA/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-en-rCA/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialog"</string>
- <string name="expanded" msgid="5974471714631304645">"Expanded"</string>
- <string name="collapsed" msgid="5389587048670450460">"Collapsed"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Dismiss"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Search"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggestions below"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-en-rGB/strings.xml b/compose/material3/material3/src/androidMain/res/values-en-rGB/strings.xml
index 7eef271..1dee3c2 100644
--- a/compose/material3/material3/src/androidMain/res/values-en-rGB/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-en-rGB/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogue"</string>
- <string name="expanded" msgid="5974471714631304645">"Expanded"</string>
- <string name="collapsed" msgid="5389587048670450460">"Collapsed"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Dismiss"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Search"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggestions below"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-en-rIN/strings.xml b/compose/material3/material3/src/androidMain/res/values-en-rIN/strings.xml
index 7eef271..1dee3c2 100644
--- a/compose/material3/material3/src/androidMain/res/values-en-rIN/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-en-rIN/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogue"</string>
- <string name="expanded" msgid="5974471714631304645">"Expanded"</string>
- <string name="collapsed" msgid="5389587048670450460">"Collapsed"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Dismiss"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Search"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggestions below"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-en-rXC/strings.xml b/compose/material3/material3/src/androidMain/res/values-en-rXC/strings.xml
index dea2fdc..e1d6c8c 100644
--- a/compose/material3/material3/src/androidMain/res/values-en-rXC/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-en-rXC/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialog"</string>
- <string name="expanded" msgid="5974471714631304645">"Expanded"</string>
- <string name="collapsed" msgid="5389587048670450460">"Collapsed"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Dismiss"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Search"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggestions below"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-es-rUS/strings.xml b/compose/material3/material3/src/androidMain/res/values-es-rUS/strings.xml
index db156dd..032f114 100644
--- a/compose/material3/material3/src/androidMain/res/values-es-rUS/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-es-rUS/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Diálogo"</string>
- <string name="expanded" msgid="5974471714631304645">"Expandido"</string>
- <string name="collapsed" msgid="5389587048670450460">"Contraído"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Descartar"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Buscar"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Sugerencias a continuación"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-es/strings.xml b/compose/material3/material3/src/androidMain/res/values-es/strings.xml
index 6226ef2..64e88b4 100644
--- a/compose/material3/material3/src/androidMain/res/values-es/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-es/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Cuadro de diálogo"</string>
- <string name="expanded" msgid="5974471714631304645">"Desplegado"</string>
- <string name="collapsed" msgid="5389587048670450460">"Contraído"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Cerrar"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Buscar"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Sugerencias a continuación"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-et/strings.xml b/compose/material3/material3/src/androidMain/res/values-et/strings.xml
index 85ea055..03f77d5 100644
--- a/compose/material3/material3/src/androidMain/res/values-et/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-et/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialoog"</string>
- <string name="expanded" msgid="5974471714631304645">"Laiendatud"</string>
- <string name="collapsed" msgid="5389587048670450460">"Ahendatud"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Loobu"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Otsing"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Soovitused on allpool"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-eu/strings.xml b/compose/material3/material3/src/androidMain/res/values-eu/strings.xml
index 2f2f09d..28b4ced 100644
--- a/compose/material3/material3/src/androidMain/res/values-eu/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-eu/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Leihoa"</string>
- <string name="expanded" msgid="5974471714631304645">"Zabalduta"</string>
- <string name="collapsed" msgid="5389587048670450460">"Tolestuta"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Baztertu"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Bilaketa"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Iradokizunak daude behean"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-fa/strings.xml b/compose/material3/material3/src/androidMain/res/values-fa/strings.xml
index aaab237..48988a4 100644
--- a/compose/material3/material3/src/androidMain/res/values-fa/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-fa/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"کادر گفتگو"</string>
- <string name="expanded" msgid="5974471714631304645">"ازهم بازشده"</string>
- <string name="collapsed" msgid="5389587048670450460">"جمعشده"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"بستن"</string>
<string name="search_bar_search" msgid="6420018528474762666">"جستجو"</string>
<string name="suggestions_available" msgid="7189888345201419934">"پیشنهادهای زیر"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-fi/strings.xml b/compose/material3/material3/src/androidMain/res/values-fi/strings.xml
index f4fa38d..4c400c4 100644
--- a/compose/material3/material3/src/androidMain/res/values-fi/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-fi/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Valintaikkuna"</string>
- <string name="expanded" msgid="5974471714631304645">"Laajennettu"</string>
- <string name="collapsed" msgid="5389587048670450460">"Tiivistetty"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Hylkää"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Hae"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Ehdotuksia alla"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-fr-rCA/strings.xml b/compose/material3/material3/src/androidMain/res/values-fr-rCA/strings.xml
index 61d15f1..2086f59 100644
--- a/compose/material3/material3/src/androidMain/res/values-fr-rCA/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-fr-rCA/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogue"</string>
- <string name="expanded" msgid="5974471714631304645">"Développé"</string>
- <string name="collapsed" msgid="5389587048670450460">"Réduit"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Fermer"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Recherche"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggestions ci-dessous"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-fr/strings.xml b/compose/material3/material3/src/androidMain/res/values-fr/strings.xml
index d0ec15d..7cd92d9 100644
--- a/compose/material3/material3/src/androidMain/res/values-fr/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-fr/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Boîte de dialogue"</string>
- <string name="expanded" msgid="5974471714631304645">"Développé"</string>
- <string name="collapsed" msgid="5389587048670450460">"Réduit"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Ignorer"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Rechercher"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggestions ci-dessous"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-gl/strings.xml b/compose/material3/material3/src/androidMain/res/values-gl/strings.xml
index 0913a02..1691a95 100644
--- a/compose/material3/material3/src/androidMain/res/values-gl/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-gl/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Cadro de diálogo"</string>
- <string name="expanded" msgid="5974471714631304645">"Despregado"</string>
- <string name="collapsed" msgid="5389587048670450460">"Contraído"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Pechar"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Busca"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Hai suxestións abaixo"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-gu/strings.xml b/compose/material3/material3/src/androidMain/res/values-gu/strings.xml
index b4a3309..088203e 100644
--- a/compose/material3/material3/src/androidMain/res/values-gu/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-gu/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"સંવાદ બૉક્સ"</string>
- <string name="expanded" msgid="5974471714631304645">"મોટી કરેલી"</string>
- <string name="collapsed" msgid="5389587048670450460">"નાની કરેલી"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"છોડી દો"</string>
<string name="search_bar_search" msgid="6420018528474762666">"શોધો"</string>
<string name="suggestions_available" msgid="7189888345201419934">"સૂચનો નીચે છે"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-hi/strings.xml b/compose/material3/material3/src/androidMain/res/values-hi/strings.xml
index e0ad0f1..4e160e0 100644
--- a/compose/material3/material3/src/androidMain/res/values-hi/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-hi/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"डायलॉग"</string>
- <string name="expanded" msgid="5974471714631304645">"बड़ा किया गया"</string>
- <string name="collapsed" msgid="5389587048670450460">"छोटा किया गया"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"खारिज करें"</string>
<string name="search_bar_search" msgid="6420018528474762666">"खोजें"</string>
<string name="suggestions_available" msgid="7189888345201419934">"सुझाव यहां मौजूद हैं"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-hr/strings.xml b/compose/material3/material3/src/androidMain/res/values-hr/strings.xml
index 12bf78f..841db10 100644
--- a/compose/material3/material3/src/androidMain/res/values-hr/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-hr/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dijaloški okvir"</string>
- <string name="expanded" msgid="5974471714631304645">"Prošireno"</string>
- <string name="collapsed" msgid="5389587048670450460">"Sažeto"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Odbaci"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Pretraživanje"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Prijedlozi su u nastavku"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-hu/strings.xml b/compose/material3/material3/src/androidMain/res/values-hu/strings.xml
index 9c8ccf6..bdd2bd2 100644
--- a/compose/material3/material3/src/androidMain/res/values-hu/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-hu/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Párbeszédablak"</string>
- <string name="expanded" msgid="5974471714631304645">"Kibontva"</string>
- <string name="collapsed" msgid="5389587048670450460">"Összecsukva"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Elvetés"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Keresés"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Javaslatok alább"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-hy/strings.xml b/compose/material3/material3/src/androidMain/res/values-hy/strings.xml
index d964992..7b65f0bc7 100644
--- a/compose/material3/material3/src/androidMain/res/values-hy/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-hy/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Երկխոսության պատուհան"</string>
- <string name="expanded" msgid="5974471714631304645">"Ծավալված է"</string>
- <string name="collapsed" msgid="5389587048670450460">"Ծալված է"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Փակել"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Որոնում"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Առաջարկները հասանելի են ստորև"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-in/strings.xml b/compose/material3/material3/src/androidMain/res/values-in/strings.xml
index 36ba535..4b45cca 100644
--- a/compose/material3/material3/src/androidMain/res/values-in/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-in/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialog"</string>
- <string name="expanded" msgid="5974471714631304645">"Diluaskan"</string>
- <string name="collapsed" msgid="5389587048670450460">"Diciutkan"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Tutup"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Telusuri"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Saran di bawah"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-is/strings.xml b/compose/material3/material3/src/androidMain/res/values-is/strings.xml
index ff5ec27..497e4d0 100644
--- a/compose/material3/material3/src/androidMain/res/values-is/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-is/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Gluggi"</string>
- <string name="expanded" msgid="5974471714631304645">"Stækkað"</string>
- <string name="collapsed" msgid="5389587048670450460">"Minnkað"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Hunsa"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Leit"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Tillögur hér fyrir neðan"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-it/strings.xml b/compose/material3/material3/src/androidMain/res/values-it/strings.xml
index 6959ff1..47c333a 100644
--- a/compose/material3/material3/src/androidMain/res/values-it/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-it/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Finestra di dialogo"</string>
- <string name="expanded" msgid="5974471714631304645">"Controllo espanso"</string>
- <string name="collapsed" msgid="5389587048670450460">"Controllo compresso"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Chiudi"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Cerca"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggerimenti sotto"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-iw/strings.xml b/compose/material3/material3/src/androidMain/res/values-iw/strings.xml
index a0750c6..999b216 100644
--- a/compose/material3/material3/src/androidMain/res/values-iw/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-iw/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"תיבת דו-שיח"</string>
- <string name="expanded" msgid="5974471714631304645">"מורחב"</string>
- <string name="collapsed" msgid="5389587048670450460">"מכווץ"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"סגירה"</string>
<string name="search_bar_search" msgid="6420018528474762666">"חיפוש"</string>
<string name="suggestions_available" msgid="7189888345201419934">"הצעות מופיעות למטה"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ja/strings.xml b/compose/material3/material3/src/androidMain/res/values-ja/strings.xml
index 3ff0d0c..c50714c 100644
--- a/compose/material3/material3/src/androidMain/res/values-ja/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ja/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ダイアログ"</string>
- <string name="expanded" msgid="5974471714631304645">"開いています"</string>
- <string name="collapsed" msgid="5389587048670450460">"閉じています"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"閉じる"</string>
<string name="search_bar_search" msgid="6420018528474762666">"検索"</string>
<string name="suggestions_available" msgid="7189888345201419934">"検索候補は次のとおりです"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ka/strings.xml b/compose/material3/material3/src/androidMain/res/values-ka/strings.xml
index 0a0e223..77575ca 100644
--- a/compose/material3/material3/src/androidMain/res/values-ka/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ka/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"დიალოგი"</string>
- <string name="expanded" msgid="5974471714631304645">"გაფართოებულია"</string>
- <string name="collapsed" msgid="5389587048670450460">"ჩაკეცილი"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"დახურვა"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ძიება"</string>
<string name="suggestions_available" msgid="7189888345201419934">"შემოთავაზებები იხილეთ ქვემოთ"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-kk/strings.xml b/compose/material3/material3/src/androidMain/res/values-kk/strings.xml
index 7ba95aa..488273e 100644
--- a/compose/material3/material3/src/androidMain/res/values-kk/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-kk/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Диалогтік терезе"</string>
- <string name="expanded" msgid="5974471714631304645">"Жайылды"</string>
- <string name="collapsed" msgid="5389587048670450460">"Жиылды"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Жабу"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Іздеу"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Төмендегі ұсыныстар"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-km/strings.xml b/compose/material3/material3/src/androidMain/res/values-km/strings.xml
index 3a087c7..4a73a7be 100644
--- a/compose/material3/material3/src/androidMain/res/values-km/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-km/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ប្រអប់"</string>
- <string name="expanded" msgid="5974471714631304645">"បានពង្រីក"</string>
- <string name="collapsed" msgid="5389587048670450460">"បានបង្រួម"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ច្រានចោល"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ស្វែងរក"</string>
<string name="suggestions_available" msgid="7189888345201419934">"ការណែនាំខាងក្រោម"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-kn/strings.xml b/compose/material3/material3/src/androidMain/res/values-kn/strings.xml
index 7e4f82e..31cf283 100644
--- a/compose/material3/material3/src/androidMain/res/values-kn/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-kn/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ಡೈಲಾಗ್"</string>
- <string name="expanded" msgid="5974471714631304645">"ವಿಸ್ತರಿಸಲಾಗಿದೆ"</string>
- <string name="collapsed" msgid="5389587048670450460">"ಕುಗ್ಗಿಸಲಾಗಿದೆ"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ವಜಾಗೊಳಿಸಿ"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ಹುಡುಕಿ"</string>
<string name="suggestions_available" msgid="7189888345201419934">"ಸಲಹೆಗಳನ್ನು ಕೆಳಗೆ ನೀಡಲಾಗಿದೆ"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ko/strings.xml b/compose/material3/material3/src/androidMain/res/values-ko/strings.xml
index 67735f6..944793c 100644
--- a/compose/material3/material3/src/androidMain/res/values-ko/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ko/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"대화상자"</string>
- <string name="expanded" msgid="5974471714631304645">"펼침"</string>
- <string name="collapsed" msgid="5389587048670450460">"접힘"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"닫기"</string>
<string name="search_bar_search" msgid="6420018528474762666">"검색"</string>
<string name="suggestions_available" msgid="7189888345201419934">"아래의 추천 검색어"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ky/strings.xml b/compose/material3/material3/src/androidMain/res/values-ky/strings.xml
index e4d6c16..331bb00 100644
--- a/compose/material3/material3/src/androidMain/res/values-ky/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ky/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Диалог"</string>
- <string name="expanded" msgid="5974471714631304645">"Жайылып көрсөтүлдү"</string>
- <string name="collapsed" msgid="5389587048670450460">"Жыйыштырылды"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Жабуу"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Издөө"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Сунуштар төмөндө келтирилди"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-lo/strings.xml b/compose/material3/material3/src/androidMain/res/values-lo/strings.xml
index c3cc53a..3f40350 100644
--- a/compose/material3/material3/src/androidMain/res/values-lo/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-lo/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ກ່ອງໂຕ້ຕອບ"</string>
- <string name="expanded" msgid="5974471714631304645">"ຂະຫຍາຍແລ້ວ"</string>
- <string name="collapsed" msgid="5389587048670450460">"ຫຍໍ້ແລ້ວ"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ປິດໄວ້"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ຊອກຫາ"</string>
<string name="suggestions_available" msgid="7189888345201419934">"ການແນະນຳຢູ່ຂ້າງລຸ່ມ"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-lt/strings.xml b/compose/material3/material3/src/androidMain/res/values-lt/strings.xml
index 2d449ad..79abf67 100644
--- a/compose/material3/material3/src/androidMain/res/values-lt/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-lt/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogo langas"</string>
- <string name="expanded" msgid="5974471714631304645">"Išskleista"</string>
- <string name="collapsed" msgid="5389587048670450460">"Sutraukta"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Atsisakyti"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Paieška"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Pasiūlymai pateikti toliau"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-lv/strings.xml b/compose/material3/material3/src/androidMain/res/values-lv/strings.xml
index a0e0c58..80d3b25 100644
--- a/compose/material3/material3/src/androidMain/res/values-lv/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-lv/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialoglodziņš"</string>
- <string name="expanded" msgid="5974471714631304645">"Izvērsts"</string>
- <string name="collapsed" msgid="5389587048670450460">"Sakļauts"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Noraidīt"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Meklēšana"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Tālāk ir sniegti ieteikumi"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-mk/strings.xml b/compose/material3/material3/src/androidMain/res/values-mk/strings.xml
index 66bfb69..e9ecb88 100644
--- a/compose/material3/material3/src/androidMain/res/values-mk/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-mk/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Дијалог"</string>
- <string name="expanded" msgid="5974471714631304645">"Проширено"</string>
- <string name="collapsed" msgid="5389587048670450460">"Собрано"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Отфрли"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Пребарување"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Предлозите се наведени подолу"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ml/strings.xml b/compose/material3/material3/src/androidMain/res/values-ml/strings.xml
index 1e0fea1..53a238e 100644
--- a/compose/material3/material3/src/androidMain/res/values-ml/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ml/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ഡയലോഗ്"</string>
- <string name="expanded" msgid="5974471714631304645">"വിപുലീകരിച്ചത്"</string>
- <string name="collapsed" msgid="5389587048670450460">"ചുരുക്കിയത്"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ഡിസ്മിസ് ചെയ്യുക"</string>
<string name="search_bar_search" msgid="6420018528474762666">"തിരയുക"</string>
<string name="suggestions_available" msgid="7189888345201419934">"നിദ്ദേശങ്ങൾ ചുവടെയുണ്ട്"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-mn/strings.xml b/compose/material3/material3/src/androidMain/res/values-mn/strings.xml
index e5b4acb..8aea383 100644
--- a/compose/material3/material3/src/androidMain/res/values-mn/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-mn/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Харилцах цонх"</string>
- <string name="expanded" msgid="5974471714631304645">"Дэлгэсэн"</string>
- <string name="collapsed" msgid="5389587048670450460">"Хураасан"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Үл хэрэгсэх"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Хайх"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Доорх зөвлөмжүүд"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-mr/strings.xml b/compose/material3/material3/src/androidMain/res/values-mr/strings.xml
index ef3edc5..89392f7 100644
--- a/compose/material3/material3/src/androidMain/res/values-mr/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-mr/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"डायलॉग"</string>
- <string name="expanded" msgid="5974471714631304645">"विस्तारित केला"</string>
- <string name="collapsed" msgid="5389587048670450460">"कोलॅप्स केला"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"डिसमिस करा"</string>
<string name="search_bar_search" msgid="6420018528474762666">"शोधा"</string>
<string name="suggestions_available" msgid="7189888345201419934">"सूचना खाली आहेत"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ms/strings.xml b/compose/material3/material3/src/androidMain/res/values-ms/strings.xml
index bf121e9..f34f6b3 100644
--- a/compose/material3/material3/src/androidMain/res/values-ms/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ms/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialog"</string>
- <string name="expanded" msgid="5974471714631304645">"Dikembangkan"</string>
- <string name="collapsed" msgid="5389587048670450460">"Dikuncupkan"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Ketepikan"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Carian"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Cadangan di bawah"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-my/strings.xml b/compose/material3/material3/src/androidMain/res/values-my/strings.xml
index 5131a8f..6761767 100644
--- a/compose/material3/material3/src/androidMain/res/values-my/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-my/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ဒိုင်ယာလော့"</string>
- <string name="expanded" msgid="5974471714631304645">"ချဲ့ထားသည်"</string>
- <string name="collapsed" msgid="5389587048670450460">"ခေါက်ထားသည်"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ပယ်ရန်"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ရှာဖွေရန်"</string>
<string name="suggestions_available" msgid="7189888345201419934">"အကြံပြုချက်များ အောက်တွင်ရှိသည်"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-nb/strings.xml b/compose/material3/material3/src/androidMain/res/values-nb/strings.xml
index 4274c3f..2a10fc4 100644
--- a/compose/material3/material3/src/androidMain/res/values-nb/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-nb/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogboks"</string>
- <string name="expanded" msgid="5974471714631304645">"Vises"</string>
- <string name="collapsed" msgid="5389587048670450460">"Skjult"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Lukk"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Søk"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Du finner forslag nedenfor"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ne/strings.xml b/compose/material3/material3/src/androidMain/res/values-ne/strings.xml
index f6180e9..4a21727 100644
--- a/compose/material3/material3/src/androidMain/res/values-ne/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ne/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"डायलग"</string>
- <string name="expanded" msgid="5974471714631304645">"एक्स्पान्ड गरियो"</string>
- <string name="collapsed" msgid="5389587048670450460">"कोल्याप्स गरियो"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"हटाउनुहोस्"</string>
<string name="search_bar_search" msgid="6420018528474762666">"खोज्नुहोस्"</string>
<string name="suggestions_available" msgid="7189888345201419934">"सुझावहरू तल दिइएका छन्"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-nl/strings.xml b/compose/material3/material3/src/androidMain/res/values-nl/strings.xml
index ca8d0ec..bc01da5 100644
--- a/compose/material3/material3/src/androidMain/res/values-nl/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-nl/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialoogvenster"</string>
- <string name="expanded" msgid="5974471714631304645">"Uitgevouwen"</string>
- <string name="collapsed" msgid="5389587048670450460">"Samengevouwen"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Sluiten"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Zoeken"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Suggesties hieronder"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-or/strings.xml b/compose/material3/material3/src/androidMain/res/values-or/strings.xml
index b8af623..16d38d5 100644
--- a/compose/material3/material3/src/androidMain/res/values-or/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-or/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ଡାଏଲଗ"</string>
- <string name="expanded" msgid="5974471714631304645">"ବିସ୍ତାର କରାଯାଇଛି"</string>
- <string name="collapsed" msgid="5389587048670450460">"ସଙ୍କୁଚିତ କରାଯାଇଛି"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ଖାରଜ କରନ୍ତୁ"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
<string name="suggestions_available" msgid="7189888345201419934">"ପରାମର୍ଶ ତଳେ ଦିଆଯାଇଛି"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-pa/strings.xml b/compose/material3/material3/src/androidMain/res/values-pa/strings.xml
index 30a8002..1c9750f5 100644
--- a/compose/material3/material3/src/androidMain/res/values-pa/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-pa/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ਵਿੰਡੋ"</string>
- <string name="expanded" msgid="5974471714631304645">"ਵਿਸਤਾਰ ਕੀਤਾ ਗਿਆ"</string>
- <string name="collapsed" msgid="5389587048670450460">"ਸਮੇਟਿਆ ਗਿਆ"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ਖਾਰਜ ਕਰੋ"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ਖੋਜੋ"</string>
<string name="suggestions_available" msgid="7189888345201419934">"ਸੁਝਾਅ ਹੇਠਾਂ ਹਨ"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-pl/strings.xml b/compose/material3/material3/src/androidMain/res/values-pl/strings.xml
index e2e9c8c..48d255e 100644
--- a/compose/material3/material3/src/androidMain/res/values-pl/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-pl/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialog"</string>
- <string name="expanded" msgid="5974471714631304645">"Rozwinięte"</string>
- <string name="collapsed" msgid="5389587048670450460">"Zwinięte"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Zamknij"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Wyszukiwanie"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Propozycje znajdziesz poniżej"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-pt-rBR/strings.xml b/compose/material3/material3/src/androidMain/res/values-pt-rBR/strings.xml
index d54b942..decc64c 100644
--- a/compose/material3/material3/src/androidMain/res/values-pt-rBR/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-pt-rBR/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Caixa de diálogo"</string>
- <string name="expanded" msgid="5974471714631304645">"Aberto"</string>
- <string name="collapsed" msgid="5389587048670450460">"Fechado"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Dispensar"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Pesquisa"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Sugestões abaixo"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-pt-rPT/strings.xml b/compose/material3/material3/src/androidMain/res/values-pt-rPT/strings.xml
index ab06fd9..263f8ce 100644
--- a/compose/material3/material3/src/androidMain/res/values-pt-rPT/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-pt-rPT/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Caixa de diálogo"</string>
- <string name="expanded" msgid="5974471714631304645">"Expandido"</string>
- <string name="collapsed" msgid="5389587048670450460">"Reduzido"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Ignorar"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Pesquisar"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Sugestões abaixo"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-pt/strings.xml b/compose/material3/material3/src/androidMain/res/values-pt/strings.xml
index d54b942..decc64c 100644
--- a/compose/material3/material3/src/androidMain/res/values-pt/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-pt/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Caixa de diálogo"</string>
- <string name="expanded" msgid="5974471714631304645">"Aberto"</string>
- <string name="collapsed" msgid="5389587048670450460">"Fechado"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Dispensar"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Pesquisa"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Sugestões abaixo"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ro/strings.xml b/compose/material3/material3/src/androidMain/res/values-ro/strings.xml
index 1280988..c844033 100644
--- a/compose/material3/material3/src/androidMain/res/values-ro/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ro/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialog"</string>
- <string name="expanded" msgid="5974471714631304645">"Extins"</string>
- <string name="collapsed" msgid="5389587048670450460">"Restrâns"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Respinge"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Caută"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Sugestii mai jos"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ru/strings.xml b/compose/material3/material3/src/androidMain/res/values-ru/strings.xml
index 8e3b21c..a7ab4255 100644
--- a/compose/material3/material3/src/androidMain/res/values-ru/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ru/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Диалоговое окно"</string>
- <string name="expanded" msgid="5974471714631304645">"Развернуто"</string>
- <string name="collapsed" msgid="5389587048670450460">"Свернуто"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Закрыть"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Строка поиска"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Подсказки показаны ниже"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-si/strings.xml b/compose/material3/material3/src/androidMain/res/values-si/strings.xml
index e77dc29..c1baeff 100644
--- a/compose/material3/material3/src/androidMain/res/values-si/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-si/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"සංවාදය"</string>
- <string name="expanded" msgid="5974471714631304645">"දිග හරින ලදි"</string>
- <string name="collapsed" msgid="5389587048670450460">"හකුළන ලදි"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"අස් කරන්න"</string>
<string name="search_bar_search" msgid="6420018528474762666">"සෙවීම"</string>
<string name="suggestions_available" msgid="7189888345201419934">"පහත යෝජනා"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-sk/strings.xml b/compose/material3/material3/src/androidMain/res/values-sk/strings.xml
index baee341..6504114 100644
--- a/compose/material3/material3/src/androidMain/res/values-sk/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-sk/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialógové okno"</string>
- <string name="expanded" msgid="5974471714631304645">"Rozbalené"</string>
- <string name="collapsed" msgid="5389587048670450460">"Zbalené"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Zavrieť"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Vyhľadávanie"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Návrhy sú nižšie"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-sl/strings.xml b/compose/material3/material3/src/androidMain/res/values-sl/strings.xml
index b01d1ca..9391485 100644
--- a/compose/material3/material3/src/androidMain/res/values-sl/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-sl/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Pogovorno okno"</string>
- <string name="expanded" msgid="5974471714631304645">"Razširjeno"</string>
- <string name="collapsed" msgid="5389587048670450460">"Strnjeno"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Opusti"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Iskanje"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Predlogi so spodaj"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-sq/strings.xml b/compose/material3/material3/src/androidMain/res/values-sq/strings.xml
index f0161e9..981374d 100644
--- a/compose/material3/material3/src/androidMain/res/values-sq/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-sq/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogu"</string>
- <string name="expanded" msgid="5974471714631304645">"U zgjerua"</string>
- <string name="collapsed" msgid="5389587048670450460">"U palos"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Hiq"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Kërko"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Sugjerimet më poshtë"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-sr/strings.xml b/compose/material3/material3/src/androidMain/res/values-sr/strings.xml
index 2b0fe74..703acf6 100644
--- a/compose/material3/material3/src/androidMain/res/values-sr/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-sr/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Дијалог"</string>
- <string name="expanded" msgid="5974471714631304645">"Проширено је"</string>
- <string name="collapsed" msgid="5389587048670450460">"Скупљено је"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Одбаците"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Претрага"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Предлози су у наставку"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-sv/strings.xml b/compose/material3/material3/src/androidMain/res/values-sv/strings.xml
index 212db21..d5d7476 100644
--- a/compose/material3/material3/src/androidMain/res/values-sv/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-sv/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialogruta"</string>
- <string name="expanded" msgid="5974471714631304645">"Utökad"</string>
- <string name="collapsed" msgid="5389587048670450460">"Komprimerad"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Stäng"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Sök"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Se förslag nedan"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-sw/strings.xml b/compose/material3/material3/src/androidMain/res/values-sw/strings.xml
index 6aa23aa..d754b92 100644
--- a/compose/material3/material3/src/androidMain/res/values-sw/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-sw/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Mazungumzo"</string>
- <string name="expanded" msgid="5974471714631304645">"Imepanuliwa"</string>
- <string name="collapsed" msgid="5389587048670450460">"Imekunjwa"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Ondoa"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Tafuta"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Mapendekezo yaliyo hapa chini"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ta/strings.xml b/compose/material3/material3/src/androidMain/res/values-ta/strings.xml
index 59cac2f..b3f5138 100644
--- a/compose/material3/material3/src/androidMain/res/values-ta/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ta/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"உரையாடல்"</string>
- <string name="expanded" msgid="5974471714631304645">"விரிக்கப்பட்டது"</string>
- <string name="collapsed" msgid="5389587048670450460">"சுருக்கப்பட்டது"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"மூடும்"</string>
<string name="search_bar_search" msgid="6420018528474762666">"தேடலாம்"</string>
<string name="suggestions_available" msgid="7189888345201419934">"பரிந்துரைகள் கீழே கிடைக்கும்"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-te/strings.xml b/compose/material3/material3/src/androidMain/res/values-te/strings.xml
index aab4e0f..394fdc0 100644
--- a/compose/material3/material3/src/androidMain/res/values-te/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-te/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"డైలాగ్"</string>
- <string name="expanded" msgid="5974471714631304645">"విస్తరించబడింది"</string>
- <string name="collapsed" msgid="5389587048670450460">"కుదించబడింది"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"విస్మరించండి"</string>
<string name="search_bar_search" msgid="6420018528474762666">"సెర్చ్ చేయండి"</string>
<string name="suggestions_available" msgid="7189888345201419934">"సూచనలు దిగువున ఉన్నాయి"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-th/strings.xml b/compose/material3/material3/src/androidMain/res/values-th/strings.xml
index 5369807..f4749f5 100644
--- a/compose/material3/material3/src/androidMain/res/values-th/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-th/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"กล่องโต้ตอบ"</string>
- <string name="expanded" msgid="5974471714631304645">"ขยาย"</string>
- <string name="collapsed" msgid="5389587048670450460">"ยุบ"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"ปิด"</string>
<string name="search_bar_search" msgid="6420018528474762666">"ค้นหา"</string>
<string name="suggestions_available" msgid="7189888345201419934">"มีคำแนะนำที่ด้านล่าง"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-tl/strings.xml b/compose/material3/material3/src/androidMain/res/values-tl/strings.xml
index cdbe629..94a7cee 100644
--- a/compose/material3/material3/src/androidMain/res/values-tl/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-tl/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Dialog"</string>
- <string name="expanded" msgid="5974471714631304645">"Naka-expand"</string>
- <string name="collapsed" msgid="5389587048670450460">"Naka-collapse"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"I-dismiss"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Maghanap"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Mga suhestyon sa ibaba"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-tr/strings.xml b/compose/material3/material3/src/androidMain/res/values-tr/strings.xml
index 795e820..b6016ad 100644
--- a/compose/material3/material3/src/androidMain/res/values-tr/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-tr/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"İletişim kutusu"</string>
- <string name="expanded" msgid="5974471714631304645">"Genişletilmiş"</string>
- <string name="collapsed" msgid="5389587048670450460">"Daraltılmış"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Kapat"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Arama"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Önerileri aşağıda bulabilirsiniz"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-uk/strings.xml b/compose/material3/material3/src/androidMain/res/values-uk/strings.xml
index 46376ba..3cf46ac 100644
--- a/compose/material3/material3/src/androidMain/res/values-uk/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-uk/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Вікно"</string>
- <string name="expanded" msgid="5974471714631304645">"Розгорнуто"</string>
- <string name="collapsed" msgid="5389587048670450460">"Згорнуто"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Закрити"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Пошук"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Підказки внизу"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-ur/strings.xml b/compose/material3/material3/src/androidMain/res/values-ur/strings.xml
index b2bbeaf..87fb830 100644
--- a/compose/material3/material3/src/androidMain/res/values-ur/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-ur/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"ڈائلاگ"</string>
- <string name="expanded" msgid="5974471714631304645">"پھیلایا گیا"</string>
- <string name="collapsed" msgid="5389587048670450460">"سکیڑا گیا"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"برخاست کریں"</string>
<string name="search_bar_search" msgid="6420018528474762666">"تلاش کریں"</string>
<string name="suggestions_available" msgid="7189888345201419934">"تلاش کی تجاویز نیچے دستیاب ہیں"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-uz/strings.xml b/compose/material3/material3/src/androidMain/res/values-uz/strings.xml
index 489ed71..a6a2ad5 100644
--- a/compose/material3/material3/src/androidMain/res/values-uz/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-uz/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Muloqot oynasi"</string>
- <string name="expanded" msgid="5974471714631304645">"Yoyilgan"</string>
- <string name="collapsed" msgid="5389587048670450460">"Yigʻilgan"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Yopish"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Qidiruv"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Takliflar quyida"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-vi/strings.xml b/compose/material3/material3/src/androidMain/res/values-vi/strings.xml
index 59d238e0..65668c5 100644
--- a/compose/material3/material3/src/androidMain/res/values-vi/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-vi/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Hộp thoại"</string>
- <string name="expanded" msgid="5974471714631304645">"Đã mở rộng"</string>
- <string name="collapsed" msgid="5389587048670450460">"Đã thu gọn"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Đóng"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Tìm kiếm"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Các đề xuất ở bên dưới"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-zh-rCN/strings.xml b/compose/material3/material3/src/androidMain/res/values-zh-rCN/strings.xml
index f2e1a9b..4c7078a 100644
--- a/compose/material3/material3/src/androidMain/res/values-zh-rCN/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-zh-rCN/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"对话框"</string>
- <string name="expanded" msgid="5974471714631304645">"已展开"</string>
- <string name="collapsed" msgid="5389587048670450460">"已收起"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"关闭"</string>
<string name="search_bar_search" msgid="6420018528474762666">"搜索"</string>
<string name="suggestions_available" msgid="7189888345201419934">"以下是搜索建议"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-zh-rHK/strings.xml b/compose/material3/material3/src/androidMain/res/values-zh-rHK/strings.xml
index 939c4ca..e7d5c56 100644
--- a/compose/material3/material3/src/androidMain/res/values-zh-rHK/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-zh-rHK/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"對話框"</string>
- <string name="expanded" msgid="5974471714631304645">"展開咗"</string>
- <string name="collapsed" msgid="5389587048670450460">"合埋咗"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"閂"</string>
<string name="search_bar_search" msgid="6420018528474762666">"搵"</string>
<string name="suggestions_available" msgid="7189888345201419934">"建議如下"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-zh-rTW/strings.xml b/compose/material3/material3/src/androidMain/res/values-zh-rTW/strings.xml
index b17c4cf..cd3d254 100644
--- a/compose/material3/material3/src/androidMain/res/values-zh-rTW/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-zh-rTW/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"對話方塊"</string>
- <string name="expanded" msgid="5974471714631304645">"已展開"</string>
- <string name="collapsed" msgid="5389587048670450460">"已收合"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"關閉"</string>
<string name="search_bar_search" msgid="6420018528474762666">"搜尋"</string>
<string name="suggestions_available" msgid="7189888345201419934">"建議如下"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values-zu/strings.xml b/compose/material3/material3/src/androidMain/res/values-zu/strings.xml
index d1f05ad..96aea73 100644
--- a/compose/material3/material3/src/androidMain/res/values-zu/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values-zu/strings.xml
@@ -18,8 +18,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dialog" msgid="4057925834421392736">"Ibhokisi"</string>
- <string name="expanded" msgid="5974471714631304645">"Kunwetshiwe"</string>
- <string name="collapsed" msgid="5389587048670450460">"Kugoqiwe"</string>
<string name="snackbar_dismiss" msgid="3962933905051144957">"Chitha"</string>
<string name="search_bar_search" msgid="6420018528474762666">"Sesha"</string>
<string name="suggestions_available" msgid="7189888345201419934">"Iziphakamiso ngezansi"</string>
diff --git a/compose/material3/material3/src/androidMain/res/values/strings.xml b/compose/material3/material3/src/androidMain/res/values/strings.xml
index dbd7ceb..1bd84cf 100644
--- a/compose/material3/material3/src/androidMain/res/values/strings.xml
+++ b/compose/material3/material3/src/androidMain/res/values/strings.xml
@@ -18,10 +18,10 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Spoken description of a dialog -->
<string name="dialog">"Dialog"</string>
- <!-- Spoken description of expanded state of an expandable item -->
- <string name="expanded">Expanded</string>
- <!-- Spoken description of collapsed state of an expandable item -->
- <string name="collapsed">Collapsed</string>
+ <!-- Spoken description of expanded state of a dropdown menu -->
+ <string name="m3c_dropdown_menu_expanded">Expanded</string>
+ <!-- Spoken description of collapsed state of a dropdown menu -->
+ <string name="m3c_dropdown_menu_collapsed">Collapsed</string>
<!-- Spoken description of a snackbar dismiss action -->
<string name="snackbar_dismiss">Dismiss</string>
<!-- Spoken description of a search bar -->
diff --git a/compose/ui/ui-graphics/api/current.txt b/compose/ui/ui-graphics/api/current.txt
index 03b828f..ac18e8a 100644
--- a/compose/ui/ui-graphics/api/current.txt
+++ b/compose/ui/ui-graphics/api/current.txt
@@ -15,6 +15,11 @@
method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
}
+ public final class AndroidColorSpace_androidKt {
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.colorspace.ColorSpace toComposeColorSpace(android.graphics.ColorSpace);
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.ColorSpace toFrameworkColorSpace(androidx.compose.ui.graphics.colorspace.ColorSpace);
+ }
+
public final class AndroidImageBitmap_androidKt {
method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
diff --git a/compose/ui/ui-graphics/api/public_plus_experimental_current.txt b/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
index 323199d..d3ac388 100644
--- a/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
@@ -15,6 +15,11 @@
method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
}
+ public final class AndroidColorSpace_androidKt {
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.colorspace.ColorSpace toComposeColorSpace(android.graphics.ColorSpace);
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.ColorSpace toFrameworkColorSpace(androidx.compose.ui.graphics.colorspace.ColorSpace);
+ }
+
public final class AndroidImageBitmap_androidKt {
method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
diff --git a/compose/ui/ui-graphics/api/restricted_current.txt b/compose/ui/ui-graphics/api/restricted_current.txt
index 220e6ff..ed16b10 100644
--- a/compose/ui/ui-graphics/api/restricted_current.txt
+++ b/compose/ui/ui-graphics/api/restricted_current.txt
@@ -45,6 +45,11 @@
method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
}
+ public final class AndroidColorSpace_androidKt {
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.colorspace.ColorSpace toComposeColorSpace(android.graphics.ColorSpace);
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.ColorSpace toFrameworkColorSpace(androidx.compose.ui.graphics.colorspace.ColorSpace);
+ }
+
public final class AndroidImageBitmap_androidKt {
method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
diff --git a/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/AndroidColorSpaceTest.kt b/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/AndroidColorSpaceTest.kt
new file mode 100644
index 0000000..25fdfe8
--- /dev/null
+++ b/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/AndroidColorSpaceTest.kt
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.graphics
+
+import android.graphics.ColorSpace
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.ui.graphics.AndroidColorSpaceTest.ColorSpaceHelper.Companion.colorSpaceTestHelper
+import androidx.compose.ui.graphics.colorspace.ColorSpaces
+import androidx.compose.ui.graphics.colorspace.Rgb
+import androidx.compose.ui.graphics.colorspace.TransferParameters
+import androidx.compose.ui.graphics.colorspace.WhitePoint
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+class AndroidColorSpaceTest {
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testSrgbColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.Srgb, // Compose
+ ColorSpace.get(ColorSpace.Named.SRGB) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testAcesColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.Aces, // Compose
+ ColorSpace.get(ColorSpace.Named.ACES) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testAcescgColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.Acescg, // Compose
+ ColorSpace.get(ColorSpace.Named.ACESCG) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testAdobeRgbColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.AdobeRgb, // Compose
+ ColorSpace.get(ColorSpace.Named.ADOBE_RGB) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testBt2020Colorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.Bt2020, // Compose
+ ColorSpace.get(ColorSpace.Named.BT2020) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testBt709Colorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.Bt709, // Compose
+ ColorSpace.get(ColorSpace.Named.BT709) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testCieLabColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.CieLab, // Compose
+ ColorSpace.get(ColorSpace.Named.CIE_LAB) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testCieXyzColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.CieXyz, // Compose
+ ColorSpace.get(ColorSpace.Named.CIE_XYZ) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testDciP3Colorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.DciP3, // Compose
+ ColorSpace.get(ColorSpace.Named.DCI_P3) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testDisplayP3Colorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.DisplayP3, // Compose
+ ColorSpace.get(ColorSpace.Named.DISPLAY_P3) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testExtendedSrgbColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.ExtendedSrgb, // Compose
+ ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testLinearExtendedSrgbColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.LinearExtendedSrgb, // Compose
+ ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testLinearSrgbColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.LinearSrgb, // Compose
+ ColorSpace.get(ColorSpace.Named.LINEAR_SRGB) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testNtsc1953Colorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.Ntsc1953, // Compose
+ ColorSpace.get(ColorSpace.Named.NTSC_1953) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testProPhotoRgbColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.ProPhotoRgb, // Compose
+ ColorSpace.get(ColorSpace.Named.PRO_PHOTO_RGB) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testSmpteCColorspace() {
+ colorSpaceTestHelper(
+ ColorSpaces.SmpteC, // Compose
+ ColorSpace.get(ColorSpace.Named.SMPTE_C) // Framework
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testUnknownColorspace3WhitePointValues() {
+ val name = "MyCustomColorSpace"
+ val whitePoint = floatArrayOf(1.0f, 2.0f, 3.0f)
+ val transferParameters = ColorSpace.Rgb.TransferParameters(
+ 0.1, // a
+ 0.2, // b
+ 0.3, // c
+ 0.4, // d
+ 0.5, // e
+ 0.6, // f
+ 0.7 // g
+ )
+ val primaries = floatArrayOf(1f, 2f, 3f, 4f, 5f, 6f)
+ colorSpaceTestHelper(
+ androidx.compose.ui.graphics.colorspace.Rgb(
+ name = name,
+ primaries = primaries,
+ WhitePoint(1.0f, 2.0f, 3.0f),
+ TransferParameters(0.7, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6)
+ ),
+ ColorSpace.Rgb(
+ name,
+ primaries,
+ whitePoint,
+ transferParameters
+ )
+ )
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun testUnknownColorspace2WhitePointValues() {
+ val name = "MyCustomColorSpace"
+ val whitePoint = floatArrayOf(1.0f, 2.0f)
+ val transferParameters = ColorSpace.Rgb.TransferParameters(
+ 0.1, // a
+ 0.2, // b
+ 0.3, // c
+ 0.4, // d
+ 0.5, // e
+ 0.6, // f
+ 0.7 // g
+ )
+ val primaries = floatArrayOf(1f, 2f, 3f, 4f, 5f, 6f)
+
+ colorSpaceTestHelper(
+ Rgb(
+ name = name,
+ primaries = primaries,
+ WhitePoint(1.0f, 2.0f),
+ TransferParameters(0.7, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6)
+ ),
+ ColorSpace.Rgb(
+ name,
+ primaries,
+ whitePoint,
+ transferParameters
+ )
+ )
+ }
+
+ // Helper class to avoid NoSuchClassExceptions being thrown when tests are run on an older
+ // API level that does not understand ColorSpace APIs
+ internal class ColorSpaceHelper {
+ companion object {
+ @RequiresApi(Build.VERSION_CODES.O)
+ fun colorSpaceTestHelper(
+ composeColorSpace: androidx.compose.ui.graphics.colorspace.ColorSpace,
+ frameworkColorSpace: ColorSpace
+ ) {
+ Assert.assertEquals(composeColorSpace, frameworkColorSpace.toComposeColorSpace())
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/ImageBitmapTest.kt b/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/ImageBitmapTest.kt
index e081e68..ab73407 100644
--- a/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/ImageBitmapTest.kt
+++ b/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/ImageBitmapTest.kt
@@ -16,22 +16,13 @@
package androidx.compose.ui.graphics
-import android.graphics.ColorSpace
-import android.graphics.ColorSpace.Named
-import android.graphics.ColorSpace.Rgb
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.compose.ui.graphics.ImageBitmapTest.ColorSpaceHelper.Companion.colorSpaceTestHelper
import androidx.compose.ui.graphics.colorspace.ColorSpaces
-import androidx.compose.ui.graphics.colorspace.TransferParameters
-import androidx.compose.ui.graphics.colorspace.WhitePoint
import androidx.test.filters.SmallTest
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test
import org.junit.runner.RunWith
import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SdkSuppress
@SmallTest
@RunWith(AndroidJUnit4::class)
@@ -54,227 +45,4 @@
assertFalse(image.hasAlpha)
assertEquals(cs, image.colorSpace)
}
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testSrgbColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.Srgb, // Compose
- ColorSpace.get(Named.SRGB) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testAcesColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.Aces, // Compose
- ColorSpace.get(Named.ACES) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testAcescgColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.Acescg, // Compose
- ColorSpace.get(Named.ACESCG) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testAdobeRgbColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.AdobeRgb, // Compose
- ColorSpace.get(Named.ADOBE_RGB) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testBt2020Colorspace() {
- colorSpaceTestHelper(
- ColorSpaces.Bt2020, // Compose
- ColorSpace.get(Named.BT2020) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testBt709Colorspace() {
- colorSpaceTestHelper(
- ColorSpaces.Bt709, // Compose
- ColorSpace.get(Named.BT709) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testCieLabColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.CieLab, // Compose
- ColorSpace.get(Named.CIE_LAB) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testCieXyzColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.CieXyz, // Compose
- ColorSpace.get(Named.CIE_XYZ) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testDciP3Colorspace() {
- colorSpaceTestHelper(
- ColorSpaces.DciP3, // Compose
- ColorSpace.get(Named.DCI_P3) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testDisplayP3Colorspace() {
- colorSpaceTestHelper(
- ColorSpaces.DisplayP3, // Compose
- ColorSpace.get(Named.DISPLAY_P3) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testExtendedSrgbColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.ExtendedSrgb, // Compose
- ColorSpace.get(Named.EXTENDED_SRGB) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testLinearExtendedSrgbColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.LinearExtendedSrgb, // Compose
- ColorSpace.get(Named.LINEAR_EXTENDED_SRGB) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testLinearSrgbColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.LinearSrgb, // Compose
- ColorSpace.get(Named.LINEAR_SRGB) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testNtsc1953Colorspace() {
- colorSpaceTestHelper(
- ColorSpaces.Ntsc1953, // Compose
- ColorSpace.get(Named.NTSC_1953) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testProPhotoRgbColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.ProPhotoRgb, // Compose
- ColorSpace.get(Named.PRO_PHOTO_RGB) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testSmpteCColorspace() {
- colorSpaceTestHelper(
- ColorSpaces.SmpteC, // Compose
- ColorSpace.get(Named.SMPTE_C) // Framework
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testUnknownColorspace3WhitePointValues() {
- val name = "MyCustomColorSpace"
- val whitePoint = floatArrayOf(1.0f, 2.0f, 3.0f)
- val transferParameters = Rgb.TransferParameters(
- 0.1, // a
- 0.2, // b
- 0.3, // c
- 0.4, // d
- 0.5, // e
- 0.6, // f
- 0.7 // g
- )
- val primaries = floatArrayOf(1f, 2f, 3f, 4f, 5f, 6f)
- colorSpaceTestHelper(
- androidx.compose.ui.graphics.colorspace.Rgb(
- name = name,
- primaries = primaries,
- WhitePoint(1.0f, 2.0f, 3.0f),
- TransferParameters(0.7, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6)
- ),
- Rgb(
- name,
- primaries,
- whitePoint,
- transferParameters
- )
- )
- }
-
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- @Test
- fun testUnknownColorspace2WhitePointValues() {
- val name = "MyCustomColorSpace"
- val whitePoint = floatArrayOf(1.0f, 2.0f)
- val transferParameters = Rgb.TransferParameters(
- 0.1, // a
- 0.2, // b
- 0.3, // c
- 0.4, // d
- 0.5, // e
- 0.6, // f
- 0.7 // g
- )
- val primaries = floatArrayOf(1f, 2f, 3f, 4f, 5f, 6f)
-
- colorSpaceTestHelper(
- androidx.compose.ui.graphics.colorspace.Rgb(
- name = name,
- primaries = primaries,
- WhitePoint(1.0f, 2.0f),
- TransferParameters(0.7, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6)
- ),
- Rgb(
- name,
- primaries,
- whitePoint,
- transferParameters
- )
- )
- }
-
- // Helper class to avoid NoSuchClassExceptions being thrown when tests are run on an older
- // API level that does not understand ColorSpace APIs
- internal class ColorSpaceHelper {
- companion object {
- @RequiresApi(Build.VERSION_CODES.O)
- fun colorSpaceTestHelper(
- composeColorSpace: androidx.compose.ui.graphics.colorspace.ColorSpace,
- frameworkColorSpace: ColorSpace
- ) {
- with(Api26Bitmap) {
- assertEquals(composeColorSpace, frameworkColorSpace.composeColorSpace())
- }
- }
- }
- }
}
\ No newline at end of file
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidColorSpace.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidColorSpace.android.kt
new file mode 100644
index 0000000..66041c1
--- /dev/null
+++ b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidColorSpace.android.kt
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.graphics
+
+import android.os.Build
+import androidx.annotation.DoNotInline
+import androidx.annotation.RequiresApi
+import androidx.compose.ui.graphics.colorspace.ColorSpace
+import androidx.compose.ui.graphics.colorspace.ColorSpaces
+import androidx.compose.ui.graphics.colorspace.Rgb
+import androidx.compose.ui.graphics.colorspace.TransferParameters
+import androidx.compose.ui.graphics.colorspace.WhitePoint
+
+/**
+ * Convert the Compose [ColorSpace] into an Android framework [android.graphics.ColorSpace]
+ */
+@RequiresApi(Build.VERSION_CODES.O)
+fun ColorSpace.toFrameworkColorSpace(): android.graphics.ColorSpace =
+ with(ColorSpaceVerificationHelper) {
+ frameworkColorSpace()
+ }
+
+/**
+ * Convert the [android.graphics.ColorSpace] into a Compose [ColorSpace]
+ */
+@RequiresApi(Build.VERSION_CODES.O)
+fun android.graphics.ColorSpace.toComposeColorSpace() =
+ with(ColorSpaceVerificationHelper) {
+ composeColorSpace()
+ }
+
+@RequiresApi(Build.VERSION_CODES.O)
+private object ColorSpaceVerificationHelper {
+
+ @DoNotInline
+ @JvmStatic
+ @RequiresApi(Build.VERSION_CODES.O)
+ fun ColorSpace.frameworkColorSpace(): android.graphics.ColorSpace {
+ val frameworkNamedSpace = when (this) {
+ ColorSpaces.Srgb -> android.graphics.ColorSpace.Named.SRGB
+ ColorSpaces.Aces -> android.graphics.ColorSpace.Named.ACES
+ ColorSpaces.Acescg -> android.graphics.ColorSpace.Named.ACESCG
+ ColorSpaces.AdobeRgb -> android.graphics.ColorSpace.Named.ADOBE_RGB
+ ColorSpaces.Bt2020 -> android.graphics.ColorSpace.Named.BT2020
+ ColorSpaces.Bt709 -> android.graphics.ColorSpace.Named.BT709
+ ColorSpaces.CieLab -> android.graphics.ColorSpace.Named.CIE_LAB
+ ColorSpaces.CieXyz -> android.graphics.ColorSpace.Named.CIE_XYZ
+ ColorSpaces.DciP3 -> android.graphics.ColorSpace.Named.DCI_P3
+ ColorSpaces.DisplayP3 -> android.graphics.ColorSpace.Named.DISPLAY_P3
+ ColorSpaces.ExtendedSrgb -> android.graphics.ColorSpace.Named.EXTENDED_SRGB
+ ColorSpaces.LinearExtendedSrgb ->
+ android.graphics.ColorSpace.Named.LINEAR_EXTENDED_SRGB
+ ColorSpaces.LinearSrgb -> android.graphics.ColorSpace.Named.LINEAR_SRGB
+ ColorSpaces.Ntsc1953 -> android.graphics.ColorSpace.Named.NTSC_1953
+ ColorSpaces.ProPhotoRgb -> android.graphics.ColorSpace.Named.PRO_PHOTO_RGB
+ ColorSpaces.SmpteC -> android.graphics.ColorSpace.Named.SMPTE_C
+ else -> android.graphics.ColorSpace.Named.SRGB
+ }
+ return android.graphics.ColorSpace.get(frameworkNamedSpace)
+ }
+
+ @DoNotInline
+ @JvmStatic
+ @RequiresApi(Build.VERSION_CODES.O)
+ fun android.graphics.ColorSpace.composeColorSpace(): ColorSpace {
+ return when (this.id) {
+ android.graphics.ColorSpace.Named.SRGB.ordinal ->
+ ColorSpaces.Srgb
+ android.graphics.ColorSpace.Named.ACES.ordinal ->
+ ColorSpaces.Aces
+ android.graphics.ColorSpace.Named.ACESCG.ordinal ->
+ ColorSpaces.Acescg
+ android.graphics.ColorSpace.Named.ADOBE_RGB.ordinal ->
+ ColorSpaces.AdobeRgb
+ android.graphics.ColorSpace.Named.BT2020.ordinal ->
+ ColorSpaces.Bt2020
+ android.graphics.ColorSpace.Named.BT709.ordinal ->
+ ColorSpaces.Bt709
+ android.graphics.ColorSpace.Named.CIE_LAB.ordinal ->
+ ColorSpaces.CieLab
+ android.graphics.ColorSpace.Named.CIE_XYZ.ordinal ->
+ ColorSpaces.CieXyz
+ android.graphics.ColorSpace.Named.DCI_P3.ordinal ->
+ ColorSpaces.DciP3
+ android.graphics.ColorSpace.Named.DISPLAY_P3.ordinal ->
+ ColorSpaces.DisplayP3
+ android.graphics.ColorSpace.Named.EXTENDED_SRGB.ordinal ->
+ ColorSpaces.ExtendedSrgb
+ android.graphics.ColorSpace.Named.LINEAR_EXTENDED_SRGB.ordinal ->
+ ColorSpaces.LinearExtendedSrgb
+ android.graphics.ColorSpace.Named.LINEAR_SRGB.ordinal ->
+ ColorSpaces.LinearSrgb
+ android.graphics.ColorSpace.Named.NTSC_1953.ordinal ->
+ ColorSpaces.Ntsc1953
+ android.graphics.ColorSpace.Named.PRO_PHOTO_RGB.ordinal ->
+ ColorSpaces.ProPhotoRgb
+ android.graphics.ColorSpace.Named.SMPTE_C.ordinal ->
+ ColorSpaces.SmpteC
+ else -> {
+ if (this is android.graphics.ColorSpace.Rgb) {
+ val transferParams = this.transferParameters
+ val whitePoint = if (this.whitePoint.size == 3) {
+ WhitePoint(this.whitePoint[0], this.whitePoint[1], this.whitePoint[2])
+ } else {
+ WhitePoint(this.whitePoint[0], this.whitePoint[1])
+ }
+
+ val composeTransferParams = if (transferParams != null) {
+ TransferParameters(
+ gamma = transferParams.g,
+ a = transferParams.a,
+ b = transferParams.b,
+ c = transferParams.c,
+ d = transferParams.d,
+ e = transferParams.e,
+ f = transferParams.f
+ )
+ } else {
+ null
+ }
+ Rgb(
+ name = this.name,
+ primaries = this.primaries,
+ whitePoint = whitePoint,
+ transform = this.transform,
+ oetf = { x -> this.oetf.applyAsDouble(x) },
+ eotf = { x -> this.eotf.applyAsDouble(x) },
+ min = this.getMinValue(0),
+ max = this.getMaxValue(0),
+ transferParameters = composeTransferParams,
+ id = this.id
+ )
+ } else {
+ ColorSpaces.Srgb
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidImageBitmap.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidImageBitmap.android.kt
index 2e7700c..463d8f3 100644
--- a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidImageBitmap.android.kt
+++ b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidImageBitmap.android.kt
@@ -17,16 +17,12 @@
package androidx.compose.ui.graphics
import android.graphics.Bitmap
-import android.graphics.ColorSpace.Named
import android.os.Build
import android.util.DisplayMetrics
import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.compose.ui.graphics.colorspace.ColorSpace
import androidx.compose.ui.graphics.colorspace.ColorSpaces
-import androidx.compose.ui.graphics.colorspace.Rgb
-import androidx.compose.ui.graphics.colorspace.TransferParameters
-import androidx.compose.ui.graphics.colorspace.WhitePoint
/**
* Create an [ImageBitmap] from the given [Bitmap]. Note this does
@@ -212,92 +208,5 @@
@DoNotInline
@JvmStatic
internal fun Bitmap.composeColorSpace() =
- colorSpace?.composeColorSpace() ?: ColorSpaces.Srgb
-
- @DoNotInline
- @JvmStatic
- internal fun ColorSpace.toFrameworkColorSpace(): android.graphics.ColorSpace {
- val frameworkNamedSpace = when (this) {
- ColorSpaces.Srgb -> Named.SRGB
- ColorSpaces.Aces -> Named.ACES
- ColorSpaces.Acescg -> Named.ACESCG
- ColorSpaces.AdobeRgb -> Named.ADOBE_RGB
- ColorSpaces.Bt2020 -> Named.BT2020
- ColorSpaces.Bt709 -> Named.BT709
- ColorSpaces.CieLab -> Named.CIE_LAB
- ColorSpaces.CieXyz -> Named.CIE_XYZ
- ColorSpaces.DciP3 -> Named.DCI_P3
- ColorSpaces.DisplayP3 -> Named.DISPLAY_P3
- ColorSpaces.ExtendedSrgb -> Named.EXTENDED_SRGB
- ColorSpaces.LinearExtendedSrgb ->
- Named.LINEAR_EXTENDED_SRGB
- ColorSpaces.LinearSrgb -> Named.LINEAR_SRGB
- ColorSpaces.Ntsc1953 -> Named.NTSC_1953
- ColorSpaces.ProPhotoRgb -> Named.PRO_PHOTO_RGB
- ColorSpaces.SmpteC -> Named.SMPTE_C
- else -> Named.SRGB
- }
- return android.graphics.ColorSpace.get(frameworkNamedSpace)
- }
-
- @DoNotInline
- @JvmStatic
- fun android.graphics.ColorSpace.composeColorSpace(): ColorSpace {
- return when (this.id) {
- Named.SRGB.ordinal -> ColorSpaces.Srgb
- Named.ACES.ordinal -> ColorSpaces.Aces
- Named.ACESCG.ordinal -> ColorSpaces.Acescg
- Named.ADOBE_RGB.ordinal -> ColorSpaces.AdobeRgb
- Named.BT2020.ordinal -> ColorSpaces.Bt2020
- Named.BT709.ordinal -> ColorSpaces.Bt709
- Named.CIE_LAB.ordinal -> ColorSpaces.CieLab
- Named.CIE_XYZ.ordinal -> ColorSpaces.CieXyz
- Named.DCI_P3.ordinal -> ColorSpaces.DciP3
- Named.DISPLAY_P3.ordinal -> ColorSpaces.DisplayP3
- Named.EXTENDED_SRGB.ordinal -> ColorSpaces.ExtendedSrgb
- Named.LINEAR_EXTENDED_SRGB.ordinal -> ColorSpaces.LinearExtendedSrgb
- Named.LINEAR_SRGB.ordinal -> ColorSpaces.LinearSrgb
- Named.NTSC_1953.ordinal -> ColorSpaces.Ntsc1953
- Named.PRO_PHOTO_RGB.ordinal -> ColorSpaces.ProPhotoRgb
- Named.SMPTE_C.ordinal -> ColorSpaces.SmpteC
- else -> {
- if (this is android.graphics.ColorSpace.Rgb) {
- val transferParams = this.transferParameters
- val whitePoint = if (this.whitePoint.size == 3) {
- WhitePoint(this.whitePoint[0], this.whitePoint[1], this.whitePoint[2])
- } else {
- WhitePoint(this.whitePoint[0], this.whitePoint[1])
- }
-
- val composeTransferParams = if (transferParams != null) {
- TransferParameters(
- gamma = transferParams.g,
- a = transferParams.a,
- b = transferParams.b,
- c = transferParams.c,
- d = transferParams.d,
- e = transferParams.e,
- f = transferParams.f
- )
- } else {
- null
- }
- Rgb(
- name = this.name,
- primaries = this.primaries,
- whitePoint = whitePoint,
- transform = this.transform,
- oetf = { x -> this.oetf.applyAsDouble(x) },
- eotf = { x -> this.eotf.applyAsDouble(x) },
- min = this.getMinValue(0),
- max = this.getMaxValue(0),
- transferParameters = composeTransferParams,
- id = this.id
- )
- } else {
- ColorSpaces.Srgb
- }
- }
- }
- }
+ colorSpace?.toComposeColorSpace() ?: ColorSpaces.Srgb
}
\ No newline at end of file
diff --git a/compose/ui/ui-unit/api/current.txt b/compose/ui/ui-unit/api/current.txt
index 923fb32..d2fa594 100644
--- a/compose/ui/ui-unit/api/current.txt
+++ b/compose/ui/ui-unit/api/current.txt
@@ -70,10 +70,6 @@
method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
}
- public fun interface DoubleLambda {
- method public double invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
ctor public Dp(float value);
method @androidx.compose.runtime.Stable public operator int compareTo(float other);
@@ -198,14 +194,6 @@
property public final long Zero;
}
- public fun interface FloatLambda {
- method public float invoke();
- }
-
- public fun interface IntLambda {
- method public int invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntOffset {
method @androidx.compose.runtime.Stable public operator int component1();
method @androidx.compose.runtime.Stable public operator int component2();
@@ -340,14 +328,6 @@
enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
}
- public fun interface LongLambda {
- method public long invoke();
- }
-
- public fun interface ShortLambda {
- method public short invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextUnit {
method public inline operator int compareTo(long other);
method public inline operator long div(float other);
diff --git a/compose/ui/ui-unit/api/public_plus_experimental_current.txt b/compose/ui/ui-unit/api/public_plus_experimental_current.txt
index a31077b..1c3e781 100644
--- a/compose/ui/ui-unit/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-unit/api/public_plus_experimental_current.txt
@@ -70,10 +70,6 @@
method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
}
- public fun interface DoubleLambda {
- method public double invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
ctor public Dp(float value);
method @androidx.compose.runtime.Stable public operator int compareTo(float other);
@@ -201,14 +197,6 @@
@kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalUnitApi {
}
- public fun interface FloatLambda {
- method public float invoke();
- }
-
- public fun interface IntLambda {
- method public int invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntOffset {
method @androidx.compose.runtime.Stable public operator int component1();
method @androidx.compose.runtime.Stable public operator int component2();
@@ -343,14 +331,6 @@
enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
}
- public fun interface LongLambda {
- method public long invoke();
- }
-
- public fun interface ShortLambda {
- method public short invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextUnit {
method public inline operator int compareTo(long other);
method public inline operator long div(float other);
diff --git a/compose/ui/ui-unit/api/restricted_current.txt b/compose/ui/ui-unit/api/restricted_current.txt
index 73cba21..8e27b25 100644
--- a/compose/ui/ui-unit/api/restricted_current.txt
+++ b/compose/ui/ui-unit/api/restricted_current.txt
@@ -70,10 +70,6 @@
method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
}
- public fun interface DoubleLambda {
- method public double invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
ctor public Dp(float value);
method @androidx.compose.runtime.Stable public operator int compareTo(float other);
@@ -198,14 +194,6 @@
property public final long Zero;
}
- public fun interface FloatLambda {
- method public float invoke();
- }
-
- public fun interface IntLambda {
- method public int invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntOffset {
method @androidx.compose.runtime.Stable public operator int component1();
method @androidx.compose.runtime.Stable public operator int component2();
@@ -340,14 +328,6 @@
enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
}
- public fun interface LongLambda {
- method public long invoke();
- }
-
- public fun interface ShortLambda {
- method public short invoke();
- }
-
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextUnit {
method public inline operator int compareTo(long other);
method public inline operator long div(float other);
diff --git a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/UnboxedLambdas.kt b/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/UnboxedLambdas.kt
deleted file mode 100644
index 7325e4a..0000000
--- a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/UnboxedLambdas.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.ui.unit
-
-/**
- * Alternative to `() -> Float` that's useful for avoiding boxing.
- *
- * Can be used as:
- *
- * fun nonBoxedArgs(a: FloatLambda?)
- */
-fun interface FloatLambda {
- fun invoke(): Float
-}
-
-/**
- * Alternative to `() -> Double` that's useful for avoiding boxing.
- *
- * Can be used as:
- *
- * fun nonBoxedArgs(color: DoubleLambda?)
- */
-fun interface DoubleLambda {
- fun invoke(): Double
-}
-
-/**
- * Alternative to `() -> Int` that's useful for avoiding boxing.
- *
- * Can be used as:
- *
- * fun nonBoxedArgs(a: IntLambda?)
- */
-fun interface IntLambda {
- fun invoke(): Int
-}
-
-/**
- * Alternative to `() -> Long` that's useful for avoiding boxing.
- *
- * Can be used as:
- *
- * fun nonBoxedArgs(a: LongLambda?)
- */
-fun interface LongLambda {
- fun invoke(): Long
-}
-
-/**
- * Alternative to `() -> Short` that's useful for avoiding boxing.
- *
- * Can be used as:
- *
- * fun nonBoxedArgs(a: ShortLambda?)
- */
-fun interface ShortLambda {
- @Suppress("NoByteOrShort")
- fun invoke(): Short
-}
\ No newline at end of file
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/ModifierNodeElement.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/ModifierNodeElement.kt
index 0bbb386..7cf6f2d 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/ModifierNodeElement.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/ModifierNodeElement.kt
@@ -89,12 +89,16 @@
tryPopulateReflectively(this@ModifierNodeElement)
}
- // Require hashCode() to be implemented. Using a data class is sufficient. Singletons and
- // modifiers with no parameters may implement this function by returning an arbitrary constant.
+ /**
+ * Require hashCode() to be implemented. Using a data class is sufficient. Singletons and
+ * modifiers with no parameters may implement this function by returning an arbitrary constant.
+ */
abstract override fun hashCode(): Int
- // Require equals() to be implemented. Using a data class is sufficient. Singletons may
- // implement this function with referential equality (`this === other`). Modifiers with no
- // inputs may implement this function by checking the type of the other object.
+ /**
+ * Require equals() to be implemented. Using a data class is sufficient. Singletons may
+ * implement this function with referential equality (`this === other`). Modifiers with no
+ * inputs may implement this function by checking the type of the other object.
+ */
abstract override fun equals(other: Any?): Boolean
}
\ No newline at end of file
diff --git a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java
index f956ce5..9da084d 100644
--- a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java
+++ b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java
@@ -17,6 +17,7 @@
package androidx.constraintlayout.motion.widget;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
import static androidx.constraintlayout.motion.widget.MotionScene.Transition.TRANSITION_FLAG_FIRST_DRAW;
import static androidx.constraintlayout.motion.widget.MotionScene.Transition.TRANSITION_FLAG_INTERCEPT_TOUCH;
import static androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.PARENT_ID;
@@ -504,8 +505,8 @@
* <table summary="Variant attributes" >
* <tr>
* <td>[ConstraintLayout attributes]</td>
- * <td>see {@see androidx.constraintlayout.widget.
- * ConstraintLayout ConstraintLayout} for attributes</td>
+ * <td>Also see {@link ConstraintLayout.LayoutParams
+ * ConstraintLayout.LayoutParams} for attributes</td>
* </tr>
* </table>
*
diff --git a/core/core/src/androidTest/java/androidx/core/view/OWNERS b/core/core/src/androidTest/java/androidx/core/view/OWNERS
index da18aa6..23e355a 100644
--- a/core/core/src/androidTest/java/androidx/core/view/OWNERS
+++ b/core/core/src/androidTest/java/androidx/core/view/OWNERS
@@ -1,2 +1,3 @@
# Bug component: 461355
-per-file AccessibilityDelegateCompatTest.java = file:accessibility/OWNERS
\ No newline at end of file
+per-file AccessibilityDelegateCompatTest.java = file:accessibility/OWNERS
+per-file ViewCompatTest.java = file:accessibility/OWNERS
\ No newline at end of file
diff --git a/core/core/src/main/java/androidx/core/view/OWNERS b/core/core/src/main/java/androidx/core/view/OWNERS
index 1e4e68f..daf6ad0 100644
--- a/core/core/src/main/java/androidx/core/view/OWNERS
+++ b/core/core/src/main/java/androidx/core/view/OWNERS
@@ -1,2 +1,3 @@
# Bug component: 461355
-per-file AccessibilityDelegateCompat.java = file:accessibility/OWNERS
\ No newline at end of file
+per-file AccessibilityDelegateCompat.java = file:accessibility/OWNERS
+per-file ViewCompat.java = file:accessibility/OWNERS
\ No newline at end of file
diff --git a/glance/glance-appwidget/build.gradle b/glance/glance-appwidget/build.gradle
index 158c764..85a163f 100644
--- a/glance/glance-appwidget/build.gradle
+++ b/glance/glance-appwidget/build.gradle
@@ -70,7 +70,6 @@
androidTestImplementation(project(":test:screenshot:screenshot"))
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
- androidTestImplementation("androidx.room:room-runtime:2.4.3")
androidTestImplementation('androidx.core:core-ktx:1.7.0')
androidTestImplementation("androidx.work:work-testing:2.7.1")
androidTestImplementation(libs.espressoCore)
diff --git a/glance/glance-appwidget/src/androidAndroidTest/kotlin/androidx/glance/appwidget/AppWidgetHostRule.kt b/glance/glance-appwidget/src/androidAndroidTest/kotlin/androidx/glance/appwidget/AppWidgetHostRule.kt
index 01b903d..2430d3f 100644
--- a/glance/glance-appwidget/src/androidAndroidTest/kotlin/androidx/glance/appwidget/AppWidgetHostRule.kt
+++ b/glance/glance-appwidget/src/androidAndroidTest/kotlin/androidx/glance/appwidget/AppWidgetHostRule.kt
@@ -36,7 +36,6 @@
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.UiDevice
import androidx.work.WorkManager
-import androidx.work.impl.WorkManagerImpl
import androidx.work.testing.WorkManagerTestInitHelper
import com.google.common.truth.Truth.assertThat
import java.lang.ref.WeakReference
@@ -112,8 +111,6 @@
mUiAutomation.dropShellPermissionIdentity()
}
WorkManager.getInstance(mContext).cancelAllWork()
- // TODO(b/242026176): remove this once WorkManager allows closing the test database.
- WorkManagerImpl.getInstance(context).workDatabase.close()
}
}
diff --git a/playground-common/playground.properties b/playground-common/playground.properties
index e17b5c1..fec6fdf 100644
--- a/playground-common/playground.properties
+++ b/playground-common/playground.properties
@@ -25,6 +25,6 @@
kotlin.code.style=official
# Disable docs
androidx.enableDocumentation=false
-androidx.playground.snapshotBuildId=9971607
+androidx.playground.snapshotBuildId=10041883
androidx.playground.metalavaBuildId=10009114
androidx.studio.type=playground
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index 3bd5882..6556553 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -76,8 +76,7 @@
implementation(project(":room:room-runtime"))
implementation(project(":room:room-paging"))
implementation(projectOrArtifact(":arch:core:core-runtime"))
- implementation(projectOrArtifact(":lifecycle:lifecycle-livedata"))
- implementation(projectOrArtifact(":lifecycle:lifecycle-livedata-ktx"))
+ implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
implementation(libs.kotlinStdlib)
implementation(libs.kotlinCoroutinesAndroid)
implementation(libs.multidex)
@@ -93,7 +92,7 @@
project(path: ":room:room-compiler", configuration: "shadowAndImplementation")
)
androidTestImplementation(projectOrArtifact(":arch:core:core-runtime"))
- androidTestImplementation(projectOrArtifact(":lifecycle:lifecycle-livedata-ktx"))
+ androidTestImplementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner) {
@@ -121,7 +120,7 @@
androidTestImplementation(project(":internal-testutils-common"))
androidTestImplementation("androidx.arch.core:core-testing:2.0.1")
androidTestImplementation("androidx.paging:paging-runtime:3.1.1")
- androidTestImplementation(projectOrArtifact(":lifecycle:lifecycle-runtime-testing"))
+ androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.6.1")
androidTestImplementation(libs.rxjava2)
androidTestImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.mockitoCore4)
diff --git a/room/room-runtime/proguard-rules.pro b/room/room-runtime/proguard-rules.pro
index 57eff04..60b1670 100644
--- a/room/room-runtime/proguard-rules.pro
+++ b/room/room-runtime/proguard-rules.pro
@@ -1,2 +1,3 @@
-keep class * extends androidx.room.RoomDatabase
-dontwarn androidx.room.paging.**
+-dontwarn androidx.lifecycle.LiveData
diff --git a/tracing/tracing/src/androidTest/java/androidx/tracing/TraceTest.java b/tracing/tracing/src/androidTest/java/androidx/tracing/TraceTest.java
index b9f58ca..1e55554 100644
--- a/tracing/tracing/src/androidTest/java/androidx/tracing/TraceTest.java
+++ b/tracing/tracing/src/androidTest/java/androidx/tracing/TraceTest.java
@@ -16,6 +16,8 @@
package androidx.tracing;
+import static androidx.tracing.Trace.MAX_TRACE_LABEL_LENGTH;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -77,6 +79,21 @@
}
@Test
+ public void beginAndEndTraceSectionLongLabel() throws IOException {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < 20; i++) {
+ builder.append("longLabel");
+ }
+ startTrace();
+ Trace.beginSection(builder.toString());
+ Trace.endSection();
+ dumpTrace();
+ assertTraceContains(
+ "tracing_mark_write:\\ B\\|.*\\|" + builder.substring(0, MAX_TRACE_LABEL_LENGTH));
+ assertTraceContains("tracing_mark_write:\\ E");
+ }
+
+ @Test
@SdkSuppress(minSdkVersion = 29) // SELinux
public void beginAndEndSectionAsync() throws IOException {
startTrace();
@@ -160,7 +177,6 @@
private void assertTraceContains(@NonNull String contentRegex) {
String traceString = new String(mByteArrayOutputStream.toByteArray(), UTF_8);
-
Pattern pattern = Pattern.compile(contentRegex);
Matcher matcher = pattern.matcher(traceString);
diff --git a/tracing/tracing/src/main/java/androidx/tracing/Trace.java b/tracing/tracing/src/main/java/androidx/tracing/Trace.java
index 8d224f9..9a7dcba 100644
--- a/tracing/tracing/src/main/java/androidx/tracing/Trace.java
+++ b/tracing/tracing/src/main/java/androidx/tracing/Trace.java
@@ -54,6 +54,7 @@
*/
public final class Trace {
static final String TAG = "Trace";
+ static final int MAX_TRACE_LABEL_LENGTH = 127;
private static long sTraceTagApp;
private static Method sIsTagEnabledMethod;
@@ -126,7 +127,7 @@
*/
public static void beginSection(@NonNull String label) {
if (Build.VERSION.SDK_INT >= 18) {
- TraceApi18Impl.beginSection(label);
+ TraceApi18Impl.beginSection(truncatedTraceSectionLabel(label));
}
}
@@ -175,9 +176,9 @@
*/
public static void beginAsyncSection(@NonNull String methodName, int cookie) {
if (Build.VERSION.SDK_INT >= 29) {
- TraceApi29Impl.beginAsyncSection(methodName, cookie);
+ TraceApi29Impl.beginAsyncSection(truncatedTraceSectionLabel(methodName), cookie);
} else {
- beginAsyncSectionFallback(methodName, cookie);
+ beginAsyncSectionFallback(truncatedTraceSectionLabel(methodName), cookie);
}
}
@@ -194,9 +195,9 @@
*/
public static void endAsyncSection(@NonNull String methodName, int cookie) {
if (Build.VERSION.SDK_INT >= 29) {
- TraceApi29Impl.endAsyncSection(methodName, cookie);
+ TraceApi29Impl.endAsyncSection(truncatedTraceSectionLabel(methodName), cookie);
} else {
- endAsyncSectionFallback(methodName, cookie);
+ endAsyncSectionFallback(truncatedTraceSectionLabel(methodName), cookie);
}
}
@@ -208,9 +209,9 @@
*/
public static void setCounter(@NonNull String counterName, int counterValue) {
if (Build.VERSION.SDK_INT >= 29) {
- TraceApi29Impl.setCounter(counterName, counterValue);
+ TraceApi29Impl.setCounter(truncatedTraceSectionLabel(counterName), counterValue);
} else {
- setCounterFallback(counterName, counterValue);
+ setCounterFallback(truncatedTraceSectionLabel(counterName), counterValue);
}
}
@@ -300,6 +301,14 @@
Log.v(TAG, "Unable to call " + methodName + " via reflection", exception);
}
+ @NonNull
+ private static String truncatedTraceSectionLabel(@NonNull String labelName) {
+ if (labelName.length() <= MAX_TRACE_LABEL_LENGTH) {
+ return labelName;
+ }
+ return labelName.substring(0, MAX_TRACE_LABEL_LENGTH);
+ }
+
private Trace() {
}
}