From 78e45e942cce4144fe772955631794389a41c156 Mon Sep 17 00:00:00 2001 From: Andrey Yepin Date: Tue, 23 Jul 2024 13:56:03 -0700 Subject: 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 --- .../contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/src') 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( -- cgit v1.2.3-59-g8ed1b