summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Andrey Yepin <ayepin@google.com> 2024-07-23 13:56:03 -0700
committer Andrey Yepin <ayepin@google.com> 2024-07-23 14:01:28 -0700
commit78e45e942cce4144fe772955631794389a41c156 (patch)
treedfbf653b731e45497c5fd6d2b324afe335f5817a /java/src
parent8cec6eefb3607d8ba666ffdecb833792efa3672b (diff)
Do not crash if max aspect ratio falls below min aspect ratio
The effective aspect ratio for the item will be in the range of [minOf(MIN_ASPECT_RATIO, maxAspectRatio), maxOf(MIN_ASPECT_RATIO, maxAspectRatio)] i.e. we always try to fit items into the view port even if the effective AR will be lower than the minimum AR. Bug: 351094699 Test: manual testing Flag: EXEMPT bugfix Change-Id: I6ae117ff816f47185caebc68c7fd3c670eacff33
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt2
1 files changed, 1 insertions, 1 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 9ac36a87..e8d75c8f 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
@@ -205,7 +205,7 @@ private fun ShareouselCard(viewModel: ShareouselPreviewViewModel, maxAspectRatio
onValueChange = { scope.launch { viewModel.setSelected(it) } },
)
) { state ->
- val aspectRatio = viewModel.aspectRatio.coerceIn(MIN_ASPECT_RATIO, maxAspectRatio)
+ val aspectRatio = minOf(maxAspectRatio, maxOf(MIN_ASPECT_RATIO, viewModel.aspectRatio))
if (state is ValueUpdate.Value) {
state.getOrDefault(null).let { bitmap ->
ShareouselCard(