summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-05-22 02:34:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-22 02:34:34 +0000
commitf1fd7bf9ce6db12ff68430f4c563bf04ebcf1a41 (patch)
tree633a20d6615e8edb93c666ae42e066a777797f23 /java/src
parentfc99d745fb875430d06a0929b3ade7cfca55f3eb (diff)
parent49f45a029f030a455ff2d2dc3093bf6151af8842 (diff)
Merge "Excludes shareousel image previews from back gesture" into main
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt2
1 files changed, 2 insertions, 0 deletions
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 85ad6ab3..38b9c6da 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
@@ -35,6 +35,7 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.systemGestureExclusion
import androidx.compose.material3.AssistChip
import androidx.compose.material3.AssistChipDefaults
import androidx.compose.material3.LocalContentColor
@@ -98,6 +99,7 @@ private fun PreviewCarousel(
modifier =
Modifier.fillMaxWidth()
.height(dimensionResource(R.dimen.chooser_preview_image_height_tall))
+ .systemGestureExclusion()
) {
items(previews.previewModels.toList(), key = { it.uri }) { model ->
ShareouselCard(viewModel.preview(model))