Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: I210d3d92c7915b8a38fce348535fe30863c2bedc
Change-Id: I605adc1dcf232163e2853c164aedf978ee5e4dc2

3 files changed, 10 insertions, 8 deletions

diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index f7c3c0b0..7cb07c61 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -55,7 +55,7 @@
     <string name="screenshot_edit" msgid="3857183660047569146">"Editar"</string>
     <string name="other_files" msgid="4501185823517473875">"{count,plural, =1{+ # archivo}many{+ # archivos}other{+ # archivos}}"</string>
     <string name="more_files" msgid="1043875756612339842">"{count,plural, =1{y # archivo más}many{y # archivos más}other{y # archivos más}}"</string>
-    <string name="sharing_text" msgid="8137537443603304062">"Compartiendo texto"</string>
+    <string name="sharing_text" msgid="8137537443603304062">"Compartir texto"</string>
     <string name="sharing_link" msgid="2307694372813942916">"Compartiendo enlace"</string>
     <string name="sharing_images" msgid="5251443722186962006">"{count,plural, =1{Compartiendo imagen}many{Compartiendo # imágenes}other{Compartiendo # imágenes}}"</string>
     <string name="sharing_videos" msgid="3583423190182877434">"{count,plural, =1{Compartiendo vídeo}many{Compartiendo # vídeos}other{Compartiendo # vídeos}}"</string>
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index 3c1be527..43921c78 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -106,5 +106,5 @@
     <string name="selectable_image" msgid="3157858923437182271">"תמונה שניתן לבחור"</string>
     <string name="selectable_video" msgid="1271768647699300826">"סרטון שניתן לבחור"</string>
     <string name="selectable_item" msgid="7557320816744205280">"פריט שניתן לבחור"</string>
-    <string name="role_description_button" msgid="4537198530568333649">"לחצן"</string>
+    <string name="role_description_button" msgid="4537198530568333649">"כפתור"</string>
 </resources>
diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
index 5b368084..c51021a8 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
@@ -33,9 +33,9 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.selection.toggleable
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.systemGestureExclusion
@@ -130,15 +130,17 @@ private fun PreviewCarousel(previews: PreviewsModel, viewModel: ShareouselViewMo
         // Do not compose the list until we have measured values
         if (measurements == PreviewCarouselMeasurements.UNMEASURED) return@Box
 
-        val carouselState =
-            rememberLazyListState(
-                prefetchStrategy = remember { ShareouselLazyListPrefetchStrategy() },
-                initialFirstVisibleItemIndex = previews.startIdx,
-                initialFirstVisibleItemScrollOffset =
+        val prefetchStrategy = remember { ShareouselLazyListPrefetchStrategy() }
+        val carouselState = remember {
+            LazyListState(
+                prefetchStrategy = prefetchStrategy,
+                firstVisibleItemIndex = previews.startIdx,
+                firstVisibleItemScrollOffset =
                     measurements.scrollOffsetToCenter(
                         previewModel = previews.previewModels[previews.startIdx]
                     ),
             )
+        }
 
         LazyRow(
             state = carouselState,