Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the scrimColor and the shape of the modal bottom sheet"

Browse Source
This commit is contained in:
Qinmei Du
2022-12-01 00:30:45 +00:00
committed by Android (Google) Code Review
parent cd097243fb 474660d33d
commit 493d0f3d2f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt
View File

@@ -117,7 +117,7 @@ fun CreateCredentialScreen(
)
}
},
scrimColor = MaterialTheme.colorScheme.scrim,
scrimColor = MaterialTheme.colorScheme.scrim.copy(alpha = 0.8f),
sheetShape = EntryShape.TopRoundedCorner,
) {}
LaunchedEffect(state.currentValue) {

5
packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
View File

@@ -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) {