summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2024-04-24 20:50:05 +0000
committer Matt Casey <mrcasey@google.com> 2024-04-25 14:33:10 +0000
commit56e24a6036c82aaa110b5092243cc95f73836611 (patch)
treee4a6fd7545166692b788b2a1b634f6ef435889df /java/src
parentd2018cd2da07c2855df3c36b8675e7591805a4dd (diff)
Only show the shareoulsel card when the image is availble.
Remove red outlines while load is in progress. Also provide a color for the background when no shareousel state is available. Bug: 336849655 Test: Visual verification with ShareTest Flag: None Change-Id: I84a41350621d828a45f037b17350e495d382afc1
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt10
1 files changed, 2 insertions, 8 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 0cb7306d..0a431c2a 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
@@ -45,9 +45,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.dimensionResource
@@ -68,6 +66,7 @@ fun Shareousel(viewModel: ShareouselViewModel) {
} else {
Spacer(
Modifier.height(dimensionResource(R.dimen.chooser_preview_image_height_tall) + 64.dp)
+ .background(MaterialTheme.colorScheme.surfaceContainer)
)
}
}
@@ -130,12 +129,7 @@ private fun ShareouselCard(viewModel: ShareouselPreviewViewModel) {
}
?: run {
// TODO: look at ScrollableImagePreviewView.setLoading()
- Box(
- modifier =
- Modifier.fillMaxHeight()
- .aspectRatio(2f / 5f)
- .border(1.dp, Color.Red, RectangleShape)
- )
+ Box(modifier = Modifier.fillMaxHeight().aspectRatio(2f / 5f))
}
},
contentType = contentType,