summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2024-04-25 17:49:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-04-25 17:49:19 +0000
commitfd332ae61555eaba7997d8e01c8f3bb51fa9edb7 (patch)
tree0d2e4bb23bcc88861ba067cdd268acdbe60f6081 /java
parent51babd2ede7355f9fb5a9cf957e12995df79bae5 (diff)
parent56e24a6036c82aaa110b5092243cc95f73836611 (diff)
Merge "Only show the shareoulsel card when the image is availble." into main
Diffstat (limited to 'java')
-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,