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

Merge "[CredManUi] Enforce left-align on several texts." into udc-dev

Browse Source
This commit is contained in:
Helen Qin
2023-03-30 22:59:55 +00:00
committed by Android (Google) Code Review
parent f3bbc7779b 2c174f5a16
commit 97120cff40
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,7 +296,11 @@ fun ProviderSelectionCard(
}
item { Divider(thickness = 24.dp, color = Color.Transparent) }
item { BodyMediumText(text = stringResource(R.string.choose_provider_body)) }
item {
Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
BodyMediumText(text = stringResource(R.string.choose_provider_body))
}
}
item { Divider(thickness = 16.dp, color = Color.Transparent) }
item {
CredentialContainerCard {
@@ -444,8 +448,10 @@ fun MoreOptionsRowIntroCard(
}
item { Divider(thickness = 24.dp, color = Color.Transparent) }
item {
BodyMediumText(text = stringResource(
R.string.use_provider_for_all_description, entryInfo.userProviderDisplayName))
Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
BodyMediumText(text = stringResource(
R.string.use_provider_for_all_description, entryInfo.userProviderDisplayName))
}
}
item { Divider(thickness = 24.dp, color = Color.Transparent) }
item {
@@ -626,25 +632,33 @@ fun MoreAboutPasskeysIntroCard(
MoreAboutPasskeySectionHeader(
text = stringResource(R.string.passwordless_technology_title)
)
BodyMediumText(text = stringResource(R.string.passwordless_technology_detail))
Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
BodyMediumText(text = stringResource(R.string.passwordless_technology_detail))
}
}
item {
MoreAboutPasskeySectionHeader(
text = stringResource(R.string.public_key_cryptography_title)
)
BodyMediumText(text = stringResource(R.string.public_key_cryptography_detail))
Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
BodyMediumText(text = stringResource(R.string.public_key_cryptography_detail))
}
}
item {
MoreAboutPasskeySectionHeader(
text = stringResource(R.string.improved_account_security_title)
)
BodyMediumText(text = stringResource(R.string.improved_account_security_detail))
Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
BodyMediumText(text = stringResource(R.string.improved_account_security_detail))
}
}
item {
MoreAboutPasskeySectionHeader(
text = stringResource(R.string.seamless_transition_title)
)
BodyMediumText(text = stringResource(R.string.seamless_transition_detail))
Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
BodyMediumText(text = stringResource(R.string.seamless_transition_detail))
}
}
}
onLog(CreateCredentialEvent.CREDMAN_CREATE_CRED_MORE_ABOUT_PASSKEYS_INTRO)