Merge "Short term solution for the in-animation-dismissal-freeze bug." into main (961d2b4e) · Commits · e / os / android_frameworks_base

packages/CredentialManager/src/com/android/credentialmanager/common/ui/BottomSheet.kt

+4 −3

Original line number	Diff line number	Diff line
		@@ -60,12 +60,13 @@ fun ModalBottomSheet(
		sheetContent = sheetContent,
		sheetShape = EntryShape.TopRoundedCorner,
		) {}
		LaunchedEffect(state.currentValue) {
		LaunchedEffect(state.currentValue, state.targetValue) {
		if (state.currentValue == ModalBottomSheetValue.Hidden) {
		if (isInitialRender) {
		onInitialRenderComplete()
		scope.launch { state.show() }
		} else {
		} else if (state.targetValue == ModalBottomSheetValue.Hidden) {
		// Only dismiss ui when the motion is downwards
		onDismiss()
		}
		}