Copy Jetpack Compose 1.12.0-alpha02 (#3032)

[CMP-10113](https://youtrack.jetbrains.com/issue/CMP-10113) Merge
Jetpack Compose 1.12.0-alpha02

| Group ID | Release Version | Release SHA | Release Build ID | Release
Date |
| --- | --- | --- | --- | --- |
| androidx.compose.animation | 1.12.0-alpha02 |
e29a109 | 15316886 | 5/6/2026 |
| androidx.compose.foundation | 1.12.0-alpha02 |
e29a109 | 15316886 | 5/6/2026 |
| androidx.compose.material | 1.12.0-alpha02 |
e29a109 | 15316886 | 5/6/2026 |
| androidx.compose.material3 | 1.5.0-alpha19 |
e29a109 | 15316886 | 5/6/2026 |
| androidx.compose.material3.adaptive | 1.3.0-beta01 |
e29a109 | 15316886 | 5/6/2026 |
| androidx.compose.remote | 1.0.0-alpha010 |
e29a109 | 15316886 | 5/6/2026 |
| androidx.compose.runtime | 1.12.0-alpha02 |
e29a109 | 15316886 | 5/6/2026 |
| androidx.compose.ui | 1.12.0-alpha02 |
e29a109 | 15316886 | 5/6/2026 |

## Release Notes
N/A

Author: MatkovIvan

buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt

@@ -668,6 +668,7 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin<Project> {
                 34 -> "8.1.1"
                 35 -> "8.6.0"
                 36 -> "8.9.1"
+                37 -> "9.1.0"
                 else -> throw Exception("Unknown compileSdk to minAgpVersion mapping")
             }
         }

compose/animation/animation-benchmark/integration-tests/macrobenchmark-target/build.gradle

@@ -30,7 +30,7 @@ android {
         }
         benchmark {
             initWith release
-            signingConfig signingConfigs.debug
+            signingConfig = signingConfigs.debug
             matchingFallbacks = ['release']
             debuggable false
         }

compose/animation/animation/src/androidDeviceTest/kotlin/androidx/compose/animation/SharedTransitionTest.kt

@@ -133,6 +133,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.StandardTestDispatcher
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Assert.assertNotEquals
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -5222,6 +5223,7 @@ class SharedTransitionTest {
         assertEquals(false, scope?.isTransitionActive)
     }
 
+    @Ignore("b/501503494")
     @Test
     fun testDetachingSharedElementAndReattachingInNewPositionBeforeAnimating() {
         var showMatch by mutableStateOf(false)

compose/animation/animation/src/commonMain/kotlin/androidx/compose/animation/SharedTransitionScope.kt

@@ -43,7 +43,6 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -1423,7 +1422,7 @@ internal constructor(lookaheadScope: LookaheadScope, val coroutineScope: Corouti
     private var _nullableLookaheadRoot: LayoutCoordinates? = null
 
     // TODO: Use MutableObjectList and impl sort
-    private val renderers = mutableStateListOf<LayerRenderer>()
+    private var renderers: List<LayerRenderer> by mutableStateOf(mutableListOf())
 
     // sharedElements are being observed for the edge events of 1) any transition has started,
     // and 2) all transitions are finished. As such, the map containing the key-sharedElement pairs
@@ -1445,18 +1444,17 @@ internal constructor(lookaheadScope: LookaheadScope, val coroutineScope: Corouti
         get() = sharedElements.toMap().values
 
     private fun sharedElementsFor(key: Any): SharedElement {
-        return sharedElements[key] ?: SharedElement(key, this).also { sharedElements[key] = it }
+        return sharedElements.getOrPut(key) { SharedElement(key, this) }
     }
 
     internal fun drawInOverlay(scope: ContentDrawScope) {
-        // TODO: Sort while preserving the parent child order
-        renderers.sortBy {
-            if (it.zIndex == 0f && it is SharedElementEntry && it.parentState == null) {
-                -1f
-            } else it.zIndex
-        }
-
-        renderers.fastForEach { it.drawInOverlay(drawScope = scope) }
+        renderers =
+            renderers.run {
+                @Suppress("ListIterator") // stdlib sort is /only/ available with an iterator
+                val sorted = sortedWith(LayerRenderer.LayerRendererComparator)
+                sorted.fastForEach { it.drawInOverlay(drawScope = scope) }
+                sorted
+            }
     }
 
     internal fun onEntryRemoved(sharedElementState: SharedElementEntry) {
@@ -1467,7 +1465,7 @@ internal constructor(lookaheadScope: LookaheadScope, val coroutineScope: Corouti
         with(sharedElementState.sharedElement) {
             removeEntry(sharedElementState)
             updateTransitionActiveness()
-            renderers.remove(sharedElementState)
+            renderers -= sharedElementState
             if (allEntries.isEmpty()) {
                 scope.coroutineScope.launch {
                     if (allEntries.isEmpty()) {
@@ -1487,24 +1485,29 @@ internal constructor(lookaheadScope: LookaheadScope, val coroutineScope: Corouti
         with(sharedElementState.sharedElement) {
             addEntry(sharedElementState)
             updateTransitionActiveness()
+            val renderersList = renderers
             val id =
-                renderers.indexOfFirst {
+                renderersList.indexOfFirst {
                     (it as? SharedElementEntry)?.sharedElement == sharedElementState.sharedElement
                 }
-            if (id == renderers.size - 1 || id == -1) {
-                renderers.add(sharedElementState)
+            if (id == -1 || id >= renderersList.size - 1) {
+                renderers += sharedElementState
             } else {
-                renderers.add(id + 1, sharedElementState)
+                renderers = buildList {
+                    addAll(renderersList.subList(0, id + 1))
+                    add(sharedElementState)
+                    addAll(renderersList.subList(id + 1, renderersList.size))
+                }
             }
         }
     }
 
     internal fun onLayerRendererCreated(renderer: LayerRenderer) {
-        renderers.add(renderer)
+        renderers += renderer
     }
 
     internal fun onLayerRendererRemoved(renderer: LayerRenderer) {
-        renderers.remove(renderer)
+        renderers -= renderer
     }
 
     private class ShapeBasedClip(val clipShape: Shape) : OverlayClip {
@@ -1530,6 +1533,17 @@ internal interface LayerRenderer {
     fun drawInOverlay(drawScope: DrawScope)
 
     val zIndex: Float
+
+    companion object LayerRendererComparator : Comparator<LayerRenderer> {
+        override fun compare(a: LayerRenderer, b: LayerRenderer): Int =
+            comparator(a).compareTo(comparator(b))
+
+        // TODO: Sort while preserving the parent child order
+        private fun comparator(it: LayerRenderer): Float =
+            if (it.zIndex == 0f && it is SharedElementEntry && it.parentState == null) {
+                -1f
+            } else it.zIndex
+    }
 }
 
 private val DefaultSpring =

compose/compiler/OWNERS

@@ -1,6 +1,7 @@
 # Bug component: 343210
 chuckj@google.com
-lelandr@google.com
 anbailey@google.com
 ashikov@google.com
-per-file settings.gradle = dustinlam@google.com, rahulrav@google.com
+derekx@google.com
+
+per-file settings.gradle = rahulrav@google.com

compose/foundation/foundation/api/current.txt

@@ -155,6 +155,7 @@ package androidx.compose.foundation {
     property public boolean isBasicTextFieldMinSizeOptimizationEnabled;
     property public boolean isCacheWindowForPagerEnabled;
     property public boolean isConcurrentTextFieldSelectionFixEnabled;
+    property public boolean isDragNodeOffsetDoubleCountingFixEnabled;
     property public boolean isInheritedTextStyleEnabled;
     property public boolean isNewContextMenuEnabled;
     property public boolean isPausableCompositionInPrefetchEnabled;
@@ -167,6 +168,7 @@ package androidx.compose.foundation {
     field public static boolean isBasicTextFieldMinSizeOptimizationEnabled;
     field public static boolean isCacheWindowForPagerEnabled;
     field public static boolean isConcurrentTextFieldSelectionFixEnabled;
+    field public static boolean isDragNodeOffsetDoubleCountingFixEnabled;
     field public static boolean isInheritedTextStyleEnabled;
     field public static boolean isNewContextMenuEnabled;
     field public static boolean isPausableCompositionInPrefetchEnabled;

compose/foundation/foundation/api/restricted_current.txt

@@ -155,6 +155,7 @@ package androidx.compose.foundation {
     property public boolean isBasicTextFieldMinSizeOptimizationEnabled;
     property public boolean isCacheWindowForPagerEnabled;
     property public boolean isConcurrentTextFieldSelectionFixEnabled;
+    property public boolean isDragNodeOffsetDoubleCountingFixEnabled;
     property public boolean isInheritedTextStyleEnabled;
     property public boolean isNewContextMenuEnabled;
     property public boolean isPausableCompositionInPrefetchEnabled;
@@ -167,6 +168,7 @@ package androidx.compose.foundation {
     field public static boolean isBasicTextFieldMinSizeOptimizationEnabled;
     field public static boolean isCacheWindowForPagerEnabled;
     field public static boolean isConcurrentTextFieldSelectionFixEnabled;
+    field public static boolean isDragNodeOffsetDoubleCountingFixEnabled;
     field public static boolean isInheritedTextStyleEnabled;
     field public static boolean isNewContextMenuEnabled;
     field public static boolean isPausableCompositionInPrefetchEnabled;

compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/TextFieldStateBenchmark.kt

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2026 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.foundation.benchmark.text
+
+import androidx.benchmark.junit4.BenchmarkRule
+import androidx.benchmark.junit4.measureRepeated
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.test.filters.LargeTest
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+@LargeTest
+@RunWith(Parameterized::class)
+class TextFieldStateBenchmark(val textLength: Int) {
+
+    @get:Rule val benchmarkRule = BenchmarkRule()
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "length={0}")
+        fun initParameters(): Array<Any> = arrayOf(10, 500)
+    }
+
+    private fun createTestState(): TextFieldState {
+        return TextFieldState("A".repeat(textLength))
+    }
+
+    @Test
+    fun edit_empty() {
+        val state = createTestState()
+        benchmarkRule.measureRepeated { state.edit {} }
+    }
+
+    @Test
+    fun edit_noChangeAfterEdit() {
+        val state = createTestState()
+        val index = state.text.length / 2
+        benchmarkRule.measureRepeated {
+            state.edit {
+                replace(index, index, "B")
+                replace(index, index + 1, "")
+            }
+        }
+    }
+
+    @Test
+    fun edit_singleReplace_noGapMove() {
+        val state = createTestState()
+        val index = state.text.length / 2
+        benchmarkRule.measureRepeated {
+            state.edit { replace(index, index, "B") }
+            runWithMeasurementDisabled {
+                // Delete the inserted text
+                state.edit { replace(index, index + 1, "") }
+            }
+        }
+    }
+
+    @Test
+    fun edit_singleReplace_gapMove() {
+        val state = createTestState()
+        val insertionIndex = state.text.length / 2
+        val gapIndex = (state.text.length / 4) * 3
+        benchmarkRule.measureRepeated {
+            runWithMeasurementDisabled {
+                // Move the gap to the gapIndex.
+                state.edit { replace(gapIndex, gapIndex, "B") }
+            }
+            state.edit { replace(insertionIndex, insertionIndex, "B") }
+            runWithMeasurementDisabled {
+                // Delete the inserted text.
+                state.edit {
+                    replace(insertionIndex, insertionIndex + 1, "")
+                    replace(gapIndex, gapIndex + 1, "")
+                }
+            }
+        }
+    }
+}

compose/foundation/foundation/build.gradle

@@ -35,7 +35,7 @@ plugins {
 
 androidXMultiplatform {
     androidLibrary {
-        compileSdk = 35
+        compileSdk = 37
         namespace = "androidx.compose.foundation"
         optimization {
             it.consumerKeepRules.publish = true

compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListPinnableContainerTest.kt

@@ -57,6 +57,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.test.filters.MediumTest
 import com.google.common.truth.Truth.assertThat
 import kotlin.collections.removeFirst as removeFirstKt
+import kotlin.random.Random
 import kotlin.test.assertTrue
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -774,6 +775,62 @@ class LazyListPinnableContainerTest(val useLookaheadScope: Boolean) {
 
         rule.onNodeWithTag("1").assertExists().assertIsNotDisplayed().assertIsPlaced()
     }
+
+    @Test
+    fun pinnedItemsAreLaidOutInOrderWhenScrolledOut() {
+        val state = LazyListState()
+        val pinnableContainerByIndex = mutableMapOf<Int, PinnableContainer>()
+        val pinHandlesByIndex = mutableMapOf<Int, PinnedHandle>()
+        val shuffelSeed = 0xCAFEBABE
+
+        val listSize = 20
+        val topPinRange = 0 until listSize / 2
+        val bottomPinRange = listSize / 2 until listSize
+
+        rule.setContentParameterized {
+            LazyColumn(Modifier.size(itemSize * 10), state = state) {
+                items(listSize) { index ->
+                    pinnableContainerByIndex[index] = LocalPinnableContainer.current!!
+                    Item(index)
+                }
+            }
+        }
+
+        rule.waitForIdle()
+
+        fun validateLayoutOrder(pinRange: IntRange) {
+            var prevTop: Float? = null
+            for (i in pinRange) {
+                val top = rule.onNodeWithTag("$i").fetchSemanticsNode().positionInRoot.y
+                if (prevTop != null) {
+                    assertThat(top).isGreaterThan(prevTop)
+                }
+                prevTop = top
+            }
+        }
+
+        topPinRange
+            .toMutableList()
+            .apply { shuffle(Random(shuffelSeed)) }
+            .forEach { i -> pinHandlesByIndex[i] = pinnableContainerByIndex[i]!!.pin() }
+
+        rule.runOnIdle { runBlocking { state.scrollToItem(listSize - 1) } }
+        rule.waitForIdle()
+        validateLayoutOrder(topPinRange)
+
+        topPinRange.forEach { i -> pinHandlesByIndex[i]!!.release() }
+
+        pinHandlesByIndex.clear()
+
+        bottomPinRange
+            .toMutableList()
+            .apply { shuffle(Random(shuffelSeed)) }
+            .forEach { i -> pinHandlesByIndex[i] = pinnableContainerByIndex[i]!!.pin() }
+
+        rule.runOnIdle { runBlocking { state.scrollToItem(0) } }
+        rule.waitForIdle()
+        validateLayoutOrder(bottomPinRange)
+    }
 }
 
 /**