diff options
| author | 2025-02-25 09:04:06 -0800 | |
|---|---|---|
| committer | 2025-02-25 09:04:06 -0800 | |
| commit | 2ed251235b216315eb062f671a7722c592942110 (patch) | |
| tree | 838673b8a2032f7568e7348ae60907a32bfa714c /java/src/com | |
| parent | aa36a2386976bc20729acc2febe5475c53522cdb (diff) | |
| parent | c2af4f1653068e310db88613392676dbca2d5d69 (diff) | |
Merge "Some initial shareousel integration tests." into main
Diffstat (limited to 'java/src/com')
4 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt b/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt index 1dc497b3..44d88c41 100644 --- a/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt +++ b/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt @@ -40,7 +40,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withPermit -private const val TAG = "PayloadSelImageLoader" +private const val TAG = "ImageLoader" @Qualifier @MustBeDocumented @Retention(AnnotationRetention.BINARY) annotation class ThumbnailSize 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 cba4600f..9a9a0821 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 @@ -66,6 +66,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.MeasureScope import androidx.compose.ui.layout.Placeable import androidx.compose.ui.layout.layout +import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription @@ -305,6 +306,7 @@ private fun ShareouselCard( targetState = bitmapLoadState, modifier = Modifier.semantics { this.contentDescription = contentDescription } + .testTag(viewModel.testTag) .clickableWithTapToScrollSupport( state = carouselState, index = index, diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt index b56aa365..85f278a6 100644 --- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt +++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt @@ -34,4 +34,5 @@ data class ShareouselPreviewViewModel( val setSelected: suspend (Boolean) -> Unit, val aspectRatio: Float, val cursorPosition: Int, + val testTag: String, ) diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt index 99053e0f..45e01e9d 100644 --- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt +++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt @@ -154,6 +154,7 @@ object ShareouselViewModelModule { aspectRatio = key.aspectRatio, // only items with a final key has a known cursor position cursorPosition = if (key.key.isFinal) key.order else -1, + testTag = key.uri.toString(), ) }, ) |