Merge "Migrate to use the official platform compose theme" into main (ffb88883) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import androidx.compose.runtime.Composable
		import androidx.compose.runtime.LaunchedEffect
		import androidx.compose.ui.res.stringResource
		import androidx.lifecycle.viewmodel.compose.viewModel
		import com.android.compose.theme.PlatformTheme
		import com.android.credentialmanager.common.Constants
		import com.android.credentialmanager.common.DialogState
		import com.android.credentialmanager.common.ProviderActivityResult
		@@ -43,7 +44,6 @@ import com.android.credentialmanager.createflow.CreateCredentialScreen
		import com.android.credentialmanager.createflow.hasContentToDisplay
		import com.android.credentialmanager.getflow.GetCredentialScreen
		import com.android.credentialmanager.getflow.hasContentToDisplay
		import com.android.credentialmanager.ui.theme.PlatformTheme

		@ExperimentalMaterialApi
		class CredentialSelectorActivity : ComponentActivity() {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,11 +24,11 @@ import androidx.compose.runtime.rememberCoroutineScope
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import com.android.compose.rememberSystemUiController
		import com.android.compose.theme.LocalAndroidColorScheme
		import com.android.credentialmanager.common.material.ModalBottomSheetLayout
		import com.android.credentialmanager.common.material.ModalBottomSheetValue
		import com.android.credentialmanager.common.material.rememberModalBottomSheetState
		import com.android.credentialmanager.ui.theme.EntryShape
		import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme
		import kotlinx.coroutines.launch


		@@ -54,7 +54,7 @@ fun ModalBottomSheet(
		setBottomSheetSystemBarsColor(sysUiController)
		}
		ModalBottomSheetLayout(
		sheetBackgroundColor = LocalAndroidColorScheme.current.colorSurfaceBright,
		sheetBackgroundColor = LocalAndroidColorScheme.current.surfaceBright,
		modifier = Modifier.background(Color.Transparent),
		sheetState = state,
		sheetContent = sheetContent,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@ import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.unit.dp
		import com.android.compose.theme.LocalAndroidColorScheme
		import com.android.credentialmanager.ui.theme.Shapes
		import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme

		/**
		* Container card for the whole sheet.
		@@ -50,7 +50,7 @@ fun SheetContainerCard(
		modifier = modifier.fillMaxWidth().wrapContentHeight(),
		border = null,
		colors = CardDefaults.cardColors(
		containerColor = LocalAndroidColorScheme.current.colorSurfaceBright,
		containerColor = LocalAndroidColorScheme.current.surfaceBright,
		),
		) {
		if (topAppBar != null) {

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -56,9 +56,9 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
		import androidx.compose.ui.unit.Dp
		import androidx.compose.ui.unit.LayoutDirection
		import androidx.compose.ui.unit.dp
		import com.android.compose.theme.LocalAndroidColorScheme
		import com.android.credentialmanager.R
		import com.android.credentialmanager.ui.theme.EntryShape
		import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme
		import com.android.credentialmanager.ui.theme.Shapes

		@Composable
		@@ -168,7 +168,7 @@ fun Entry(
		// Decorative purpose only.
		contentDescription = null,
		modifier = Modifier.size(24.dp),
		tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		tint = LocalAndroidColorScheme.current.onSurfaceVariant,
		)
		}
		}
		@@ -182,7 +182,7 @@ fun Entry(
		Icon(
		modifier = iconSize,
		bitmap = iconImageBitmap,
		tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		tint = LocalAndroidColorScheme.current.onSurfaceVariant,
		// Decorative purpose only.
		contentDescription = null,
		)
		@@ -206,7 +206,7 @@ fun Entry(
		Icon(
		modifier = iconSize,
		imageVector = iconImageVector,
		tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		tint = LocalAndroidColorScheme.current.onSurfaceVariant,
		// Decorative purpose only.
		contentDescription = null,
		)
		@@ -218,7 +218,7 @@ fun Entry(
		Icon(
		modifier = iconSize,
		painter = iconPainter,
		tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		tint = LocalAndroidColorScheme.current.onSurfaceVariant,
		// Decorative purpose only.
		contentDescription = null,
		)
		@@ -229,9 +229,9 @@ fun Entry(
		},
		border = null,
		colors = SuggestionChipDefaults.suggestionChipColors(
		containerColor = LocalAndroidColorScheme.current.colorSurfaceContainerHigh,
		labelColor = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		iconContentColor = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		containerColor = LocalAndroidColorScheme.current.surfaceContainerHigh,
		labelColor = LocalAndroidColorScheme.current.onSurfaceVariant,
		iconContentColor = LocalAndroidColorScheme.current.onSurfaceVariant,
		),
		)
		}
		@@ -294,7 +294,7 @@ fun PasskeyBenefitRow(
		Icon(
		modifier = Modifier.size(24.dp),
		painter = leadingIconPainter,
		tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		tint = LocalAndroidColorScheme.current.onSurfaceVariant,
		// Decorative purpose only.
		contentDescription = null,
		)
		@@ -353,7 +353,7 @@ fun MoreOptionTopAppBar(
		R.string.accessibility_back_arrow_button
		),
		modifier = Modifier.size(24.dp).autoMirrored(),
		tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		tint = LocalAndroidColorScheme.current.onSurfaceVariant,
		)
		}
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,20 +24,20 @@ import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.unit.dp
		import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme
		import com.android.compose.theme.LocalAndroidColorScheme

		@Composable
		fun CredentialListSectionHeader(text: String, isFirstSection: Boolean) {
		InternalSectionHeader(
		text = text,
		color = LocalAndroidColorScheme.current.colorOnSurfaceVariant,
		color = LocalAndroidColorScheme.current.onSurfaceVariant,
		applyTopPadding = !isFirstSection
		)
		}

		@Composable
		fun MoreAboutPasskeySectionHeader(text: String) {
		InternalSectionHeader(text, LocalAndroidColorScheme.current.colorOnSurface)
		InternalSectionHeader(text, LocalAndroidColorScheme.current.onSurface)
		}

		@Composable