Change the create a passkey screen to show the username/displayName from (4b2efe93) · Commits · e / os / android_frameworks_base

packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import android.os.Bundle
	import android.os.ResultReceiver		import android.os.ResultReceiver
	import com.android.credentialmanager.createflow.CreatePasskeyUiState		import com.android.credentialmanager.createflow.CreatePasskeyUiState
	import com.android.credentialmanager.createflow.CreateScreenState		import com.android.credentialmanager.createflow.CreateScreenState
			import com.android.credentialmanager.createflow.RequestDisplayInfo
	import com.android.credentialmanager.getflow.GetCredentialUiState		import com.android.credentialmanager.getflow.GetCredentialUiState
	import com.android.credentialmanager.getflow.GetScreenState		import com.android.credentialmanager.getflow.GetScreenState

	@@ -95,9 +96,12 @@ class CredentialManagerRepo(

	fun createPasskeyInitialUiState(): CreatePasskeyUiState {		fun createPasskeyInitialUiState(): CreatePasskeyUiState {
	val providerList = CreateFlowUtils.toProviderList(providerList, context)		val providerList = CreateFlowUtils.toProviderList(providerList, context)
			val requestDisplayInfo = RequestDisplayInfo(
			"Elisa Beckett", "beckett-bakert@gmail.com", "TYPE_CREATE")
	return CreatePasskeyUiState(		return CreatePasskeyUiState(
	providers = providerList,		providers = providerList,
	currentScreenState = CreateScreenState.PASSKEY_INTRO,		currentScreenState = CreateScreenState.PASSKEY_INTRO,
			requestDisplayInfo,
	)		)
	}		}

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

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,21 @@ data class CreateOptionInfo(
	val usageData: String		val usageData: String
	)		)

			data class RequestDisplayInfo(
			val userName: String,
			val displayName: String,
			val type: String,
			)

			/**
			* This is initialized to be the most recent used. Can then be changed if
			* user selects a different entry on the more option page.
			*/
			data class ActiveEntry (
			val activeProvider: ProviderInfo,
			val activeCreateOptionInfo: CreateOptionInfo,
			)

	/** The name of the current screen. */		/** The name of the current screen. */
	enum class CreateScreenState {		enum class CreateScreenState {
	PASSKEY_INTRO,		PASSKEY_INTRO,

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

+57 −24

Original line number	Original line	Diff line number	Diff line
	@@ -70,21 +70,21 @@ fun CreatePasskeyScreen(
	onProviderSelected = {viewModel.onProviderSelected(it)}		onProviderSelected = {viewModel.onProviderSelected(it)}
	)		)
	CreateScreenState.CREATION_OPTION_SELECTION -> CreationSelectionCard(		CreateScreenState.CREATION_OPTION_SELECTION -> CreationSelectionCard(
	providerInfo = uiState.selectedProvider!!,		requestDisplayInfo = uiState.requestDisplayInfo,
	onOptionSelected = {viewModel.onCreateOptionSelected(it)},		providerInfo = uiState.activeEntry?.activeProvider!!,
			onOptionSelected = {viewModel.onPrimaryCreateOptionInfoSelected()},
	onCancel = {viewModel.onCancel()},		onCancel = {viewModel.onCancel()},
	multiProvider = uiState.providers.size > 1,		multiProvider = uiState.providers.size > 1,
	onMoreOptionsSelected = {viewModel.onMoreOptionsSelected(it)}		onMoreOptionsSelected = {viewModel.onMoreOptionsSelected()}
	)		)
	CreateScreenState.MORE_OPTIONS_SELECTION -> MoreOptionsSelectionCard(		CreateScreenState.MORE_OPTIONS_SELECTION -> MoreOptionsSelectionCard(
	providerInfo = uiState.selectedProvider!!,
	providerList = uiState.providers,		providerList = uiState.providers,
	onBackButtonSelected = {viewModel.onBackButtonSelected(it)},		onBackButtonSelected = {viewModel.onBackButtonSelected()},
	onOptionSelected = {viewModel.onMoreOptionsRowSelected(it)}		onOptionSelected = {viewModel.onMoreOptionsRowSelected(it)}
	)		)
	CreateScreenState.MORE_OPTIONS_ROW_INTRO -> MoreOptionsRowIntroCard(		CreateScreenState.MORE_OPTIONS_ROW_INTRO -> MoreOptionsRowIntroCard(
	providerInfo = uiState.selectedProvider!!,		providerInfo = uiState.activeEntry?.activeProvider!!,
	onDefaultOrNotSelected = {viewModel.onDefaultOrNotSelected(it)}		onDefaultOrNotSelected = {viewModel.onDefaultOrNotSelected()}
	)		)
	}		}
	},		},
	@@ -218,10 +218,9 @@ fun ProviderSelectionCard(
	@ExperimentalMaterialApi		@ExperimentalMaterialApi
	@Composable		@Composable
	fun MoreOptionsSelectionCard(		fun MoreOptionsSelectionCard(
	providerInfo: ProviderInfo,
	providerList: List<ProviderInfo>,		providerList: List<ProviderInfo>,
	onBackButtonSelected: (String) -> Unit,		onBackButtonSelected: () -> Unit,
	onOptionSelected: (String) -> Unit		onOptionSelected: (ActiveEntry) -> Unit
	) {		) {
	Card(		Card(
	backgroundColor = lightBackgroundColor,		backgroundColor = lightBackgroundColor,
	@@ -235,7 +234,7 @@ fun MoreOptionsSelectionCard(
	elevation = 0.dp,		elevation = 0.dp,
	navigationIcon =		navigationIcon =
	{		{
	IconButton(onClick = { onBackButtonSelected(providerInfo.name) }) {		IconButton(onClick = onBackButtonSelected) {
	Icon(Icons.Filled.ArrowBack, "backIcon"		Icon(Icons.Filled.ArrowBack, "backIcon"
	)		)
	}		}
	@@ -264,9 +263,12 @@ fun MoreOptionsSelectionCard(
	providerList.forEach { providerInfo ->		providerList.forEach { providerInfo ->
	providerInfo.createOptions.forEach { createOptionInfo ->		providerInfo.createOptions.forEach { createOptionInfo ->
	item {		item {
	MoreOptionsInfoRow(providerInfo = providerInfo,		MoreOptionsInfoRow(
			providerInfo = providerInfo,
	createOptionInfo = createOptionInfo,		createOptionInfo = createOptionInfo,
	onOptionSelected = onOptionSelected)		onOptionSelected = {
			onOptionSelected(ActiveEntry(providerInfo, createOptionInfo))
			})
	}		}
	}		}
	}		}
	@@ -285,7 +287,7 @@ fun MoreOptionsSelectionCard(
	@Composable		@Composable
	fun MoreOptionsRowIntroCard(		fun MoreOptionsRowIntroCard(
	providerInfo: ProviderInfo,		providerInfo: ProviderInfo,
	onDefaultOrNotSelected: (String) -> Unit,		onDefaultOrNotSelected: () -> Unit,
	) {		) {
	Card(		Card(
	backgroundColor = lightBackgroundColor,		backgroundColor = lightBackgroundColor,
	@@ -302,11 +304,11 @@ fun MoreOptionsRowIntroCard(
	) {		) {
	CancelButton(		CancelButton(
	stringResource(R.string.use_once),		stringResource(R.string.use_once),
	onclick = { onDefaultOrNotSelected(providerInfo.name) }		onclick = onDefaultOrNotSelected
	)		)
	ConfirmButton(		ConfirmButton(
	stringResource(R.string.set_as_default),		stringResource(R.string.set_as_default),
	onclick = { onDefaultOrNotSelected(providerInfo.name) }		onclick = onDefaultOrNotSelected
	)		)
	}		}
	Divider(		Divider(
	@@ -388,11 +390,12 @@ fun NavigationButton(
	@ExperimentalMaterialApi		@ExperimentalMaterialApi
	@Composable		@Composable
	fun CreationSelectionCard(		fun CreationSelectionCard(
			requestDisplayInfo: RequestDisplayInfo,
	providerInfo: ProviderInfo,		providerInfo: ProviderInfo,
	onOptionSelected: (Int) -> Unit,		onOptionSelected: () -> Unit,
	onCancel: () -> Unit,		onCancel: () -> Unit,
	multiProvider: Boolean,		multiProvider: Boolean,
	onMoreOptionsSelected: (String) -> Unit,		onMoreOptionsSelected: () -> Unit,
	) {		) {
	Card(		Card(
	backgroundColor = lightBackgroundColor,		backgroundColor = lightBackgroundColor,
	@@ -427,14 +430,13 @@ fun CreationSelectionCard(
	LazyColumn(		LazyColumn(
	verticalArrangement = Arrangement.spacedBy(2.dp)		verticalArrangement = Arrangement.spacedBy(2.dp)
	) {		) {
	providerInfo.createOptions.forEach {
	item {		item {
	CreateOptionRow(createOptionInfo = it, onOptionSelected = onOptionSelected)		PrimaryCreateOptionRow(requestDisplayInfo = requestDisplayInfo,
	}		onOptionSelected = onOptionSelected)
	}		}
	if (multiProvider) {		if (multiProvider) {
	item {		item {
	MoreOptionsRow(onSelect = { onMoreOptionsSelected(providerInfo.name) })		MoreOptionsRow(onSelect = onMoreOptionsSelected)
	}		}
	}		}
	}		}
	@@ -492,16 +494,47 @@ fun CreateOptionRow(createOptionInfo: CreateOptionInfo, onOptionSelected: (Int)
	}		}
	}		}

			@ExperimentalMaterialApi
			@Composable
			fun PrimaryCreateOptionRow(
			requestDisplayInfo: RequestDisplayInfo,
			onOptionSelected: () -> Unit
			) {
			Chip(
			modifier = Modifier.fillMaxWidth(),
			onClick = {onOptionSelected()},
			// TODO: Add an icon generated by provider according to requestDisplayInfo type
			colors = ChipDefaults.chipColors(
			backgroundColor = Grey100,
			leadingIconContentColor = Grey100
			),
			shape = Shapes.large
			) {
			Column() {
			Text(
			text = requestDisplayInfo.userName,
			style = Typography.h6,
			modifier = Modifier.padding(top = 16.dp)
			)
			Text(
			text = requestDisplayInfo.displayName,
			style = Typography.body2,
			modifier = Modifier.padding(bottom = 16.dp)
			)
			}
			}
			}

	@ExperimentalMaterialApi		@ExperimentalMaterialApi
	@Composable		@Composable
	fun MoreOptionsInfoRow(		fun MoreOptionsInfoRow(
	providerInfo: ProviderInfo,		providerInfo: ProviderInfo,
	createOptionInfo: CreateOptionInfo,		createOptionInfo: CreateOptionInfo,
	onOptionSelected: (String) -> Unit		onOptionSelected: () -> Unit
	) {		) {
	Chip(		Chip(
	modifier = Modifier.fillMaxWidth(),		modifier = Modifier.fillMaxWidth(),
	onClick = { onOptionSelected(providerInfo.name) },		onClick = onOptionSelected,
	leadingIcon = {		leadingIcon = {
	Image(modifier = Modifier.size(24.dp, 24.dp).padding(start = 10.dp),		Image(modifier = Modifier.size(24.dp, 24.dp).padding(start = 10.dp),
	bitmap = createOptionInfo.icon.toBitmap().asImageBitmap(),		bitmap = createOptionInfo.icon.toBitmap().asImageBitmap(),

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

+27 −13

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,8 @@ import com.android.credentialmanager.common.ResultState
	data class CreatePasskeyUiState(		data class CreatePasskeyUiState(
	val providers: List<ProviderInfo>,		val providers: List<ProviderInfo>,
	val currentScreenState: CreateScreenState,		val currentScreenState: CreateScreenState,
	val selectedProvider: ProviderInfo? = null,		val requestDisplayInfo: RequestDisplayInfo,
			val activeEntry: ActiveEntry? = null,
	)		)

	class CreatePasskeyViewModel(		class CreatePasskeyViewModel(
	@@ -56,7 +57,8 @@ class CreatePasskeyViewModel(
	} else if (uiState.providers.size == 1){		} else if (uiState.providers.size == 1){
	uiState = uiState.copy(		uiState = uiState.copy(
	currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,		currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,
	selectedProvider = uiState.providers.first()		activeEntry = ActiveEntry(uiState.providers.first(),
			uiState.providers.first().createOptions.first())
	)		)
	} else {		} else {
	throw java.lang.IllegalStateException("Empty provider list.")		throw java.lang.IllegalStateException("Empty provider list.")
	@@ -66,14 +68,15 @@ class CreatePasskeyViewModel(
	fun onProviderSelected(providerName: String) {		fun onProviderSelected(providerName: String) {
	uiState = uiState.copy(		uiState = uiState.copy(
	currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,		currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,
	selectedProvider = getProviderInfoByName(providerName)		activeEntry = ActiveEntry(getProviderInfoByName(providerName),
			getProviderInfoByName(providerName).createOptions.first())
	)		)
	}		}

	fun onCreateOptionSelected(createOptionId: Int) {		fun onCreateOptionSelected(createOptionId: Int) {
	Log.d("Account Selector", "Option selected for creation: $createOptionId")		Log.d("Account Selector", "Option selected for creation: $createOptionId")
	CredentialManagerRepo.getInstance().onOptionSelected(		CredentialManagerRepo.getInstance().onOptionSelected(
	uiState.selectedProvider!!.name,		uiState.activeEntry?.activeProvider!!.name,
	createOptionId		createOptionId
	)		)
	dialogResult.value = DialogResult(		dialogResult.value = DialogResult(
	@@ -87,24 +90,22 @@ class CreatePasskeyViewModel(
	}		}
	}		}

	fun onMoreOptionsSelected(providerName: String) {		fun onMoreOptionsSelected() {
	uiState = uiState.copy(		uiState = uiState.copy(
	currentScreenState = CreateScreenState.MORE_OPTIONS_SELECTION,		currentScreenState = CreateScreenState.MORE_OPTIONS_SELECTION,
	selectedProvider = getProviderInfoByName(providerName)
	)		)
	}		}

	fun onBackButtonSelected(providerName: String) {		fun onBackButtonSelected() {
	uiState = uiState.copy(		uiState = uiState.copy(
	currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,		currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,
	selectedProvider = getProviderInfoByName(providerName)
	)		)
	}		}

	fun onMoreOptionsRowSelected(providerName: String) {		fun onMoreOptionsRowSelected(activeEntry: ActiveEntry) {
	uiState = uiState.copy(		uiState = uiState.copy(
	currentScreenState = CreateScreenState.MORE_OPTIONS_ROW_INTRO,		currentScreenState = CreateScreenState.MORE_OPTIONS_ROW_INTRO,
	selectedProvider = getProviderInfoByName(providerName)		activeEntry = activeEntry
	)		)
	}		}

	@@ -113,11 +114,24 @@ class CreatePasskeyViewModel(
	dialogResult.value = DialogResult(ResultState.CANCELED)		dialogResult.value = DialogResult(ResultState.CANCELED)
	}		}

	fun onDefaultOrNotSelected(providerName: String) {		fun onDefaultOrNotSelected() {
	uiState = uiState.copy(		uiState = uiState.copy(
	currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,		currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,
	selectedProvider = getProviderInfoByName(providerName)
	)		)
	// TODO: implement the if choose as default or not logic later		// TODO: implement the if choose as default or not logic later
	}		}

			fun onPrimaryCreateOptionInfoSelected() {
			var createOptionId = uiState.activeEntry?.activeCreateOptionInfo?.id
			Log.d("Account Selector", "Option selected for creation: $createOptionId")
			if (createOptionId != null) {
			CredentialManagerRepo.getInstance().onOptionSelected(
			uiState.activeEntry?.activeProvider!!.name,
			createOptionId
			)
			}
			dialogResult.value = DialogResult(
			ResultState.COMPLETE,
			)
			}
	}		}