MaxMood96 · pull · Jan 12, 2026 · Jan 7, 2026 · Dec 18, 2025 · Jan 2, 2026
diff --git a/biometric/biometric/src/main/res/values-bs/strings.xml b/biometric/biometric/src/main/res/values-bs/strings.xml
@@ -35,7 +35,7 @@
     <string name="use_fingerprint_label" msgid="6961788485681412417">"Koristi otisak prsta"</string>
     <string name="use_face_label" msgid="6533512708069459542">"Koristi otključavanje licem"</string>
     <string name="use_biometric_label" msgid="6524145989441579428">"Koristi biometriju"</string>
-    <string name="use_screen_lock_label" msgid="5459869335976243512">"Koristi zaključavanje ekrana"</string>
+    <string name="use_screen_lock_label" msgid="5459869335976243512">"Koristi otključavanje ekrana"</string>
     <string name="use_fingerprint_or_screen_lock_label" msgid="7577690399303139443">"Koristi otisak prsta ili zaključavanje ekrana"</string>
     <string name="use_face_or_screen_lock_label" msgid="2116180187159450292">"Koristi otključavanje licem ili zaključavanje ekrana"</string>
     <string name="use_biometric_or_screen_lock_label" msgid="5385448280139639016">"Koristi biometriju ili zaključavanje ekrana"</string>

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/studio/StudioTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/studio/StudioTask.kt
@@ -376,9 +376,9 @@ abstract class StudioTask : DefaultTask() {
     ) {
         val url =
             if (filename.contains("-mac")) {
-                "https://redirector.gvt1.com/edgedl/android/studio/install/$studioVersion/$filename"
+                "https://edgedl.me.gvt1.com/android/studio/install/$studioVersion/$filename"
             } else {
-                "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/$studioVersion/$filename"
+                "https://edgedl.me.gvt1.com/android/studio/ide-zips/$studioVersion/$filename"
             }
         val tmpDownloadPath = File("$destinationPath.tmp").absolutePath
         println("Downloading $url to $tmpDownloadPath")

diff --git a/.../compose/integration/hero/sysui/macrobenchmark/SysUiSceneTransitionLayoutHeroBenchmark.kt b/.../compose/integration/hero/sysui/macrobenchmark/SysUiSceneTransitionLayoutHeroBenchmark.kt
@@ -93,7 +93,7 @@ class SysUiSceneTransitionLayoutHeroBenchmark(private val compilationMode: Compi
     }
 
     companion object {
-        const val ITERATIONS = 25
+        const val ITERATIONS = 10
 
         @Parameterized.Parameters(name = "compilation={0}")
         @JvmStatic

diff --git a/...e/integration/hero/sysui/macrobenchmark/SysUiSceneTransitionLayoutStartupHeroBenchmark.kt b/...e/integration/hero/sysui/macrobenchmark/SysUiSceneTransitionLayoutStartupHeroBenchmark.kt
@@ -47,7 +47,7 @@ class SysUiSceneTransitionLayoutStartupHeroBenchmark(
             // elements for the quick settings but also nested SceneTransitionLayouts for each
             // notification.
             sysuiHeroBenchmarkScope()
-                .startDemoActivity(StlDemoConstants.SHADE_SCENE, notificationsInShade = 300)
+                .startDemoActivity(StlDemoConstants.SHADE_SCENE, notificationsInShade = 10)
         }
     }
 

diff --git a/compose/integration-tests/macrobenchmark-target/OWNERS b/compose/integration-tests/macrobenchmark-target/OWNERS
@@ -1,4 +1,5 @@
 # Bug component: 378604
-andreykulikov@google.com
 bentrengrove@google.com
-ccraik@google.com
+ccraik@google.com
+ashikov@google.com
+jossiwolf@google.com
diff --git a/...c/main/java/androidx/compose/integration/macrobenchmark/target/PagerOfLazyGridActivity.kt b/...c/main/java/androidx/compose/integration/macrobenchmark/target/PagerOfLazyGridActivity.kt
@@ -21,7 +21,10 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.safeContent
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.pager.HorizontalPager
@@ -61,7 +64,12 @@ private fun HorizontalPagerOfLazyGrid(pages: Int = 100, gridItems: Int = 100) {
     val pagerState: PagerState = rememberPagerState(initialPage = 1) { pages }
     val coroutineScope = rememberCoroutineScope()
 
-    Column(modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.background)) {
+    Column(
+        modifier =
+            Modifier.fillMaxSize()
+                .background(MaterialTheme.colors.background)
+                .windowInsetsPadding(WindowInsets.safeContent)
+    ) {
         Button(
             onClick = {
                 coroutineScope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) }

diff --git a/compose/material3/material3/api/current.ignore b/compose/material3/material3/api/current.ignore
@@ -1075,3 +1075,7 @@ RemovedMethod: androidx.compose.material3.pulltorefresh.PullToRefreshDefaults#In
     Binary breaking change: Removed method androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.IndicatorBox(androidx.compose.material3.pulltorefresh.PullToRefreshState,boolean,androidx.compose.ui.Modifier,float,androidx.compose.ui.graphics.Shape,long,float,kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>)
 RemovedMethod: androidx.compose.material3.pulltorefresh.PullToRefreshKt#pullToRefresh(androidx.compose.ui.Modifier, boolean, androidx.compose.material3.pulltorefresh.PullToRefreshState, boolean, float, kotlin.jvm.functions.Function0<kotlin.Unit>):
     Binary breaking change: Removed method androidx.compose.material3.pulltorefresh.PullToRefreshKt.pullToRefresh(androidx.compose.ui.Modifier,boolean,androidx.compose.material3.pulltorefresh.PullToRefreshState,boolean,float,kotlin.jvm.functions.Function0<kotlin.Unit>)
+
+
+RemovedProperty: androidx.compose.material3.AppBarMenuState#isExpanded:
+    Source breaking change: Removed property androidx.compose.material3.AppBarMenuState#isExpanded
diff --git a/compose/material3/material3/api/restricted_current.ignore b/compose/material3/material3/api/restricted_current.ignore
@@ -1075,3 +1075,7 @@ RemovedMethod: androidx.compose.material3.pulltorefresh.PullToRefreshDefaults#In
     Binary breaking change: Removed method androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.IndicatorBox(androidx.compose.material3.pulltorefresh.PullToRefreshState,boolean,androidx.compose.ui.Modifier,float,androidx.compose.ui.graphics.Shape,long,float,kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>)
 RemovedMethod: androidx.compose.material3.pulltorefresh.PullToRefreshKt#pullToRefresh(androidx.compose.ui.Modifier, boolean, androidx.compose.material3.pulltorefresh.PullToRefreshState, boolean, float, kotlin.jvm.functions.Function0<kotlin.Unit>):
     Binary breaking change: Removed method androidx.compose.material3.pulltorefresh.PullToRefreshKt.pullToRefresh(androidx.compose.ui.Modifier,boolean,androidx.compose.material3.pulltorefresh.PullToRefreshState,boolean,float,kotlin.jvm.functions.Function0<kotlin.Unit>)
+
+
+RemovedProperty: androidx.compose.material3.AppBarMenuState#isExpanded:
+    Source breaking change: Removed property androidx.compose.material3.AppBarMenuState#isExpanded
diff --git a/compose/runtime/runtime/api/current.ignore b/compose/runtime/runtime/api/current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+ChangedAnnotationRetention: androidx.compose.runtime.internal.FunctionKeyMeta:
+    Class androidx.compose.runtime.internal.FunctionKeyMeta incompatibly changed its retention from RUNTIME to BINARY
+ChangedAnnotationRetention: androidx.compose.runtime.internal.FunctionKeyMeta.Container:
+    Class androidx.compose.runtime.internal.FunctionKeyMeta.Container incompatibly changed its retention from RUNTIME to BINARY
diff --git a/compose/runtime/runtime/api/current.txt b/compose/runtime/runtime/api/current.txt
@@ -910,7 +910,7 @@ package androidx.compose.runtime.internal {
     method @androidx.compose.runtime.ComposeCompilerApi public static Void illegalDecoyCallException(String fName);
   }
 
-  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface FunctionKeyMeta {
+  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface FunctionKeyMeta {
     ctor @KotlinOnly public FunctionKeyMeta(int key, int startOffset, int endOffset);
     method @InaccessibleFromKotlin public abstract int endOffset();
     method @InaccessibleFromKotlin public abstract int key();
@@ -920,7 +920,7 @@ package androidx.compose.runtime.internal {
     property public abstract int startOffset;
   }
 
-  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface FunctionKeyMeta.Container {
+  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface FunctionKeyMeta.Container {
     method public abstract androidx.compose.runtime.internal.FunctionKeyMeta[] value();
   }
 

diff --git a/compose/runtime/runtime/api/restricted_current.ignore b/compose/runtime/runtime/api/restricted_current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+ChangedAnnotationRetention: androidx.compose.runtime.internal.FunctionKeyMeta:
+    Class androidx.compose.runtime.internal.FunctionKeyMeta incompatibly changed its retention from RUNTIME to BINARY
+ChangedAnnotationRetention: androidx.compose.runtime.internal.FunctionKeyMeta.Container:
+    Class androidx.compose.runtime.internal.FunctionKeyMeta.Container incompatibly changed its retention from RUNTIME to BINARY
diff --git a/compose/runtime/runtime/api/restricted_current.txt b/compose/runtime/runtime/api/restricted_current.txt
@@ -965,7 +965,7 @@ package androidx.compose.runtime.internal {
     method @androidx.compose.runtime.ComposeCompilerApi public static Void illegalDecoyCallException(String fName);
   }
 
-  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface FunctionKeyMeta {
+  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface FunctionKeyMeta {
     ctor @KotlinOnly public FunctionKeyMeta(int key, int startOffset, int endOffset);
     method @InaccessibleFromKotlin public abstract int endOffset();
     method @InaccessibleFromKotlin public abstract int key();
@@ -975,7 +975,7 @@ package androidx.compose.runtime.internal {
     property public abstract int startOffset;
   }
 
-  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface FunctionKeyMeta.Container {
+  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface FunctionKeyMeta.Container {
     method public abstract androidx.compose.runtime.internal.FunctionKeyMeta[] value();
   }
 

diff --git a/...untime/runtime/src/commonMain/kotlin/androidx/compose/runtime/internal/FunctionKeyMeta.kt b/...untime/runtime/src/commonMain/kotlin/androidx/compose/runtime/internal/FunctionKeyMeta.kt
@@ -30,7 +30,7 @@ import androidx.compose.runtime.ComposeCompilerApi
  */
 @ComposeCompilerApi
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
+@Retention(AnnotationRetention.BINARY)
 @Repeatable
 public annotation class FunctionKeyMeta(val key: Int, val startOffset: Int, val endOffset: Int)
 

diff --git a/constraintlayout/constraintlayout-compose/api/current.ignore b/constraintlayout/constraintlayout-compose/api/current.ignore
@@ -389,3 +389,7 @@ RemovedMethod: androidx.constraintlayout.compose.State#setRootIncomingConstraint
     Binary breaking change: Removed method androidx.constraintlayout.compose.State.setRootIncomingConstraints(long)
 RemovedMethod: androidx.constraintlayout.compose.VerticalAnchorable#linkTo(androidx.constraintlayout.compose.ConstraintLayoutBaseScope.VerticalAnchor, float, float):
     Binary breaking change: Removed method androidx.constraintlayout.compose.VerticalAnchorable.linkTo(androidx.constraintlayout.compose.ConstraintLayoutBaseScope.VerticalAnchor,float,float)
+
+
+RemovedProperty: androidx.constraintlayout.compose.ConstrainedLayoutReference#id:
+    Source breaking change: Removed property androidx.constraintlayout.compose.ConstrainedLayoutReference#id
diff --git a/constraintlayout/constraintlayout-compose/api/restricted_current.ignore b/constraintlayout/constraintlayout-compose/api/restricted_current.ignore
@@ -435,3 +435,9 @@ RemovedMethod: androidx.constraintlayout.compose.State#setRootIncomingConstraint
     Binary breaking change: Removed method androidx.constraintlayout.compose.State.setRootIncomingConstraints(long)
 RemovedMethod: androidx.constraintlayout.compose.VerticalAnchorable#linkTo(androidx.constraintlayout.compose.ConstraintLayoutBaseScope.VerticalAnchor, float, float):
     Binary breaking change: Removed method androidx.constraintlayout.compose.VerticalAnchorable.linkTo(androidx.constraintlayout.compose.ConstraintLayoutBaseScope.VerticalAnchor,float,float)
+
+
+RemovedProperty: androidx.constraintlayout.compose.ConstrainedLayoutReference#id:
+    Source breaking change: Removed property androidx.constraintlayout.compose.ConstrainedLayoutReference#id
+RemovedProperty: androidx.constraintlayout.compose.ToolingUtilsKt#designInfoProvider:
+    Source breaking change: Removed property androidx.constraintlayout.compose.ToolingUtilsKt#designInfoProvider