diff options
| author | 2024-05-28 15:34:34 +0000 | |
|---|---|---|
| committer | 2024-05-28 15:36:18 +0000 | |
| commit | 3c1b61595d2bde70587136e95769865dd32f9e2e (patch) | |
| tree | 4a4e08f668987f1182ecd79583e442179bbd7098 /java/src | |
| parent | 6a177cb46c15ec6d3a58bba61cf9191f08ee9c78 (diff) | |
Add file icon to shareousel for file shares.
Bug: 341923652
Test: Manual test with ShareTest
Flag: android.service.chooser.chooser_payload_toggling
Change-Id: If796d5d6d373cab8bb5ca97448f484a2683fd3c3
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselCardComposable.kt | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselCardComposable.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselCardComposable.kt index a0be1a9b..197d6858 100644 --- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselCardComposable.kt +++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselCardComposable.kt @@ -47,18 +47,28 @@ fun ShareouselCard( val topButtonPadding = 12.dp Box(modifier = Modifier.padding(topButtonPadding).matchParentSize()) { SelectionIcon(selected, modifier = Modifier.align(Alignment.TopStart)) - if (contentType == ContentType.Video) { - AnimationIcon(modifier = Modifier.align(Alignment.TopEnd)) + when (contentType) { + ContentType.Video -> + TypeIcon( + R.drawable.ic_play_circle_filled_24px, + modifier = Modifier.align(Alignment.TopEnd) + ) + ContentType.Other -> + TypeIcon( + R.drawable.chooser_file_generic, + modifier = Modifier.align(Alignment.TopEnd) + ) + ContentType.Image -> Unit // No additional icon needed. } } } } @Composable -private fun AnimationIcon(modifier: Modifier = Modifier) { +private fun TypeIcon(drawableResource: Int, modifier: Modifier = Modifier) { Icon( - painterResource(id = R.drawable.ic_play_circle_filled_24px), - contentDescription = null, // Video attribute described at a higher level. + painterResource(id = drawableResource), + contentDescription = null, // Type attribute described at a higher level. tint = Color.White, modifier = Modifier.size(20.dp).then(modifier) ) |