Merge "Move provider text to body in create / save dialog" into main (708711e2) · Commits · e / os / android_frameworks_base

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

+26 −12

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.credentialmanager.createflow

		import android.credentials.flags.Flags.selectorUiImprovementsEnabled
		import android.text.TextUtils
		import androidx.activity.compose.ManagedActivityResultLauncher
		import androidx.activity.result.ActivityResult
		@@ -329,6 +330,18 @@ fun CreationSelectionCard(
		)
		}
		item { Divider(thickness = 24.dp, color = Color.Transparent) }

		val footerDescription = createOptionInfo.footerDescription
		if (selectorUiImprovementsEnabled()) {
		if (!footerDescription.isNullOrBlank()) {
		item {
		Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
		BodySmallText(text = footerDescription)
		}
		}
		item { Divider(thickness = 24.dp, color = Color.Transparent) }
		}
		}
		item {
		CredentialContainerCard {
		PrimaryCreateOptionRow(
		@@ -366,7 +379,7 @@ fun CreationSelectionCard(
		},
		)
		}
		val footerDescription = createOptionInfo.footerDescription
		if (!selectorUiImprovementsEnabled()) {
		if (footerDescription != null && footerDescription.length > 0) {
		item {
		Divider(
		@@ -382,6 +395,7 @@ fun CreationSelectionCard(
		}
		}
		}
		}
		onLog(CreateCredentialEvent.CREDMAN_CREATE_CRED_CREATION_OPTION_SELECTION)
		}