use flowengine across credential selector screens (38681f39) · Commits · e / os / android_frameworks_base

packages/CredentialManager/wear/res/values/strings.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@
		<!-- Title of a screen prompting if the user would like to use their saved passkey.
		[CHAR LIMIT=80] -->
		<string name="use_passkey_title">Use passkey?</string>
		<!-- Title of a screen prompting if the user would like to use their saved passkey.
		[CHAR LIMIT=80] -->
		<string name="use_sign_in_with_provider_title">Use your sign in for %1$s</string>
		<!-- Title of a screen prompting if the user would like to sign in with provider
		[CHAR LIMIT=80] -->
		<string name="use_password_title">Use password?</string>
		@@ -35,6 +32,8 @@
		<string name="dialog_sign_in_options_button">Sign-in Options</string>
		<!-- Title for multiple credentials folded screen. [CHAR LIMIT=NONE] -->
		<string name="sign_in_options_title">Sign-in Options</string>
		<!-- Provider settings list title. [CHAR LIMIT=NONE] -->
		<string name="provider_list_title">Manage sign-ins</string>
		<!-- Title for multiple credentials screen. [CHAR LIMIT=NONE] -->
		<string name="choose_sign_in_title">Choose a sign in</string>
		<!-- Title for multiple credentials screen with only passkeys. [CHAR LIMIT=NONE] -->

packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorViewModel.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,10 @@ sealed class CredentialSelectorUiState {
		data object Idle : CredentialSelectorUiState()
		sealed class Get : CredentialSelectorUiState() {
		data class SingleEntry(val entry: CredentialEntryInfo) : Get()
		data class SingleEntryPerAccount(val sortedEntries: List<CredentialEntryInfo>) : Get()
		data class SingleEntryPerAccount(
		val sortedEntries: List<CredentialEntryInfo>,
		val authenticationEntryList: List<AuthenticationEntryInfo>,
		) : Get()
		data class MultipleEntry(
		val accounts: List<PerUserNameEntries>,
		val actionEntryList: List<ActionEntryInfo>,

packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt

+51 −38

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import androidx.wear.compose.foundation.rememberSwipeToDismissBoxState
		import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
		import androidx.wear.compose.navigation.rememberSwipeDismissableNavHostState
		import com.android.credentialmanager.CredentialSelectorUiState
		import com.android.credentialmanager.CredentialSelectorUiState.Get.SingleEntryPerAccount
		import com.android.credentialmanager.CredentialSelectorUiState.Get.SingleEntry
		import com.android.credentialmanager.CredentialSelectorUiState.Get.MultipleEntry
		import com.android.credentialmanager.CredentialSelectorViewModel
		@@ -45,6 +46,8 @@ import com.google.android.horologist.compose.navscaffold.scrollable
		import com.android.credentialmanager.model.CredentialType
		import com.android.credentialmanager.model.EntryInfo
		import com.android.credentialmanager.ui.screens.multiple.MultiCredentialsFoldScreen
		import com.android.credentialmanager.ui.screens.multiple.MultiCredentialsFlattenScreen


		@OptIn(ExperimentalHorologistApi::class)
		@Composable
		@@ -78,23 +81,33 @@ fun WearApp(

		scrollable(Screen.SinglePasskeyScreen.route) {
		SinglePasskeyScreen(
		credentialSelectorUiState = viewModel.uiState.value as SingleEntry,
		entry = (remember { uiState } as SingleEntry).entry,
		columnState = it.columnState,
		flowEngine = flowEngine,
		)
		}

		scrollable(Screen.SignInWithProviderScreen.route) {
		SignInWithProviderScreen(
		credentialSelectorUiState = viewModel.uiState.value as SingleEntry,
		entry = (remember { uiState } as SingleEntry).entry,
		columnState = it.columnState,
		flowEngine = flowEngine,
		)
		}

		scrollable(Screen.MultipleCredentialsScreenFold.route) {
		MultiCredentialsFoldScreen(
		credentialSelectorUiState = viewModel.uiState.value as MultipleEntry,
		screenIcon = null,
		credentialSelectorUiState = (remember { uiState } as SingleEntryPerAccount),
		columnState = it.columnState,
		flowEngine = flowEngine,
		)
		}

		scrollable(Screen.MultipleCredentialsScreenFlatten.route) {
		MultiCredentialsFlattenScreen(
		credentialSelectorUiState = (remember { uiState } as MultipleEntry),
		columnState = it.columnState,
		flowEngine = flowEngine,
		)
		}
		}
		@@ -108,6 +121,7 @@ fun WearApp(
		navController.navigateToLoading()
		}
		}

		is CredentialSelectorUiState.Get -> {
		handleGetNavigation(
		navController = navController,
		@@ -157,13 +171,12 @@ private fun handleGetNavigation(
		}
		}

		is MultipleEntry -> {
		is SingleEntryPerAccount -> {
		navController.navigateToMultipleCredentialsFoldScreen()
		}

		else -> {
		// TODO: b/301206470 - Implement other get flows
		onCloseApp()
		is MultipleEntry -> {
		navController.navigateToMultipleCredentialsFlattenScreen()
		}
		}
		}

packages/CredentialManager/wear/src/com/android/credentialmanager/ui/mappers/CredentialSelectorUiStateGetMapper.kt

+5 −2

Original line number	Diff line number	Diff line
		@@ -32,11 +32,14 @@ fun Request.Get.toGet(isPrimary: Boolean): CredentialSelectorUiState.Get {
		return if (isPrimary) {
		if (accounts.size == 1) {
		CredentialSelectorUiState.Get.SingleEntry(
		accounts[0].value.minWith(comparator)
		entry = accounts[0].value.minWith(comparator)
		)
		} else {
		CredentialSelectorUiState.Get.SingleEntryPerAccount(
		accounts.map { it.value.minWith(comparator) }.sortedWith(comparator)
		sortedEntries = accounts.map {
		it.value.minWith(comparator)
		}.sortedWith(comparator),
		authenticationEntryList = providerInfos.flatMap { it.authenticationEntryList }
		)
		}
		} else {

packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/UiState.kt

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.credentialmanager.ui.screens

		import androidx.activity.result.IntentSenderRequest

		sealed class UiState {
		data object CredentialScreen : UiState()

		data class CredentialSelected(
		val intentSenderRequest: IntentSenderRequest?
		) : UiState()

		data object Cancel : UiState()
		}