Merge "[CredManUi] Enforce left-align on several texts." into udc-dev (97120cff) · Commits · e / os / android_frameworks_base

packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt

+21 −7

Original line number	Diff line number	Diff line
		@@ -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,9 +448,11 @@ fun MoreOptionsRowIntroCard(
		}
		item { Divider(thickness = 24.dp, color = Color.Transparent) }
		item {
		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 {
		CtaButtonRow(
		@@ -626,27 +632,35 @@ fun MoreAboutPasskeysIntroCard(
		MoreAboutPasskeySectionHeader(
		text = stringResource(R.string.passwordless_technology_title)
		)
		Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
		BodyMediumText(text = stringResource(R.string.passwordless_technology_detail))
		}
		}
		item {
		MoreAboutPasskeySectionHeader(
		text = stringResource(R.string.public_key_cryptography_title)
		)
		Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
		BodyMediumText(text = stringResource(R.string.public_key_cryptography_detail))
		}
		}
		item {
		MoreAboutPasskeySectionHeader(
		text = stringResource(R.string.improved_account_security_title)
		)
		Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
		BodyMediumText(text = stringResource(R.string.improved_account_security_detail))
		}
		}
		item {
		MoreAboutPasskeySectionHeader(
		text = stringResource(R.string.seamless_transition_title)
		)
		Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
		BodyMediumText(text = stringResource(R.string.seamless_transition_detail))
		}
		}
		}
		onLog(CreateCredentialEvent.CREDMAN_CREATE_CRED_MORE_ABOUT_PASSKEYS_INTRO)
		}