From 474660d33dd8311c4b498312827a94570f184c23 Mon Sep 17 00:00:00 2001
From: Qinmei Du <duqinmei@google.com>
Date: Wed, 30 Nov 2022 07:59:43 +0000
Subject: [PATCH] Update the scrimColor and the shape of the modal bottom sheet

screenshot: https://screenshot.googleplex.com/8MEHpC5qYb26h5o

Test: deployed locally

Bug: 253157211
Change-Id: Ib03fff0811b9909fa4f49e2ce2280ce6ded58d8c
---
 .../createflow/CreateCredentialComponents.kt                 | 2 +-
 .../credentialmanager/getflow/GetCredentialComponents.kt     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt
index fde32792e8f84..0e36b3abb7ac8 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt
@@ -110,7 +110,7 @@ fun CreateCredentialScreen(
         )
       }
     },
-    scrimColor = MaterialTheme.colorScheme.scrim,
+    scrimColor = MaterialTheme.colorScheme.scrim.copy(alpha = 0.8f),
     sheetShape = EntryShape.TopRoundedCorner,
   ) {}
   LaunchedEffect(state.currentValue) {
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
index 8ccdf4cf972a2..720f231609c3e 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
@@ -61,6 +61,7 @@ import com.android.credentialmanager.common.ui.CancelButton
 import com.android.credentialmanager.common.ui.Entry
 import com.android.credentialmanager.common.ui.TransparentBackgroundEntry
 import com.android.credentialmanager.jetpack.developer.PublicKeyCredential
+import com.android.credentialmanager.ui.theme.EntryShape
 
 @Composable
 fun GetCredentialScreen(
@@ -94,8 +95,8 @@ fun GetCredentialScreen(
         )
       }
     },
-    scrimColor = Color.Transparent,
-    sheetShape = MaterialTheme.shapes.medium,
+    scrimColor = MaterialTheme.colorScheme.scrim.copy(alpha = 0.8f),
+    sheetShape = EntryShape.TopRoundedCorner,
   ) {}
   LaunchedEffect(state.currentValue) {
     if (state.currentValue == ModalBottomSheetValue.Hidden) {