Merge "[CredManUi] Padding between credential card & subheader 8dp" into udc-dev (767a9abe) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
	import androidx.compose.ui.res.stringResource		import androidx.compose.ui.res.stringResource
	import androidx.compose.ui.text.AnnotatedString		import androidx.compose.ui.text.AnnotatedString
	import androidx.compose.ui.text.input.PasswordVisualTransformation		import androidx.compose.ui.text.input.PasswordVisualTransformation
			import androidx.compose.ui.unit.Dp
	import androidx.compose.ui.unit.dp		import androidx.compose.ui.unit.dp
	import com.android.credentialmanager.R		import com.android.credentialmanager.R
	import com.android.credentialmanager.ui.theme.EntryShape		import com.android.credentialmanager.ui.theme.EntryShape
	@@ -315,6 +316,7 @@ fun CtaButtonRow(
	fun MoreOptionTopAppBar(		fun MoreOptionTopAppBar(
	text: String,		text: String,
	onNavigationIconClicked: () -> Unit,		onNavigationIconClicked: () -> Unit,
			bottomPadding: Dp,
	) {		) {
	TopAppBar(		TopAppBar(
	title = {		title = {
	@@ -341,6 +343,6 @@ fun MoreOptionTopAppBar(
	}		}
	},		},
	colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent),		colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent),
	modifier = Modifier.padding(top = 12.dp, bottom = 8.dp)		modifier = Modifier.padding(top = 12.dp, bottom = bottomPadding)
	)		)
	}		}
			No newline at end of file

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ fun MoreAboutPasskeySectionHeader(text: String) {

	@Composable		@Composable
	private fun InternalSectionHeader(text: String, color: Color) {		private fun InternalSectionHeader(text: String, color: Color) {
	Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {		Row(modifier = Modifier.fillMaxWidth().wrapContentHeight().padding(top = 8.dp)) {
	SectionHeaderText(		SectionHeaderText(
	text,		text,
	modifier = Modifier.padding(top = 20.dp, bottom = 8.dp),		modifier = Modifier.padding(top = 20.dp, bottom = 8.dp),

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -371,9 +371,9 @@ fun MoreOptionsSelectionCard(
	onNavigationIconClicked =		onNavigationIconClicked =
	if (isFromProviderSelection) onBackProviderSelectionButtonSelected		if (isFromProviderSelection) onBackProviderSelectionButtonSelected
	else onBackCreationSelectionButtonSelected,		else onBackCreationSelectionButtonSelected,
			bottomPadding = 16.dp,
	)		)
	}) {		}) {
	item { Divider(thickness = 8.dp, color = Color.Transparent) } // Top app bar has a 8dp
	// bottom padding already		// bottom padding already
	item {		item {
	CredentialContainerCard {		CredentialContainerCard {
	@@ -617,9 +617,9 @@ fun MoreAboutPasskeysIntroCard(
	MoreOptionTopAppBar(		MoreOptionTopAppBar(
	text = stringResource(R.string.more_about_passkeys_title),		text = stringResource(R.string.more_about_passkeys_title),
	onNavigationIconClicked = onBackPasskeyIntroButtonSelected,		onNavigationIconClicked = onBackPasskeyIntroButtonSelected,
			bottomPadding = 0.dp,
	)		)
	},		},
	contentVerticalArrangement = Arrangement.spacedBy(8.dp)
	) {		) {
	item {		item {
	MoreAboutPasskeySectionHeader(		MoreAboutPasskeySectionHeader(

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -287,6 +287,7 @@ fun AllSignInOptionCard(
	MoreOptionTopAppBar(		MoreOptionTopAppBar(
	text = stringResource(R.string.get_dialog_title_sign_in_options),		text = stringResource(R.string.get_dialog_title_sign_in_options),
	onNavigationIconClicked = if (isNoAccount) onCancel else onBackButtonClicked,		onNavigationIconClicked = if (isNoAccount) onCancel else onBackButtonClicked,
			bottomPadding = 0.dp,
	)		)
	}) {		}) {
	// For username		// For username