Merge "[CredManUI] UI style P0 fixes" into udc-dev
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/DialogResult.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/DialogResult.kt
index 6d07df7..2971433 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/common/DialogResult.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/common/DialogResult.kt
@@ -24,8 +24,6 @@
enum class ResultState {
COMPLETE,
- NORMAL_CANCELED,
- LAUNCH_SETTING_CANCELED
}
data class DialogResult(
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ActionButton.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ActionButton.kt
index b94840f..04a2c07 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ActionButton.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ActionButton.kt
@@ -16,6 +16,7 @@
package com.android.credentialmanager.common.ui
+import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
import com.android.credentialmanager.R
import androidx.compose.material.Icon
@@ -33,7 +34,6 @@
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
-import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme
@Composable
fun ActionButton(text: String, onClick: () -> Unit) {
@@ -42,12 +42,10 @@
onClick = onClick,
colors = ButtonDefaults.textButtonColors(
contentColor = MaterialTheme.colorScheme.primary,
- )
+ ),
+ contentPadding = PaddingValues(start = 12.dp, top = 10.dp, end = 12.dp, bottom = 10.dp),
) {
- LargeLabelText(
- text = text,
- modifier = Modifier.padding(vertical = 10.dp, horizontal = 12.dp),
- )
+ LargeLabelText(text = text)
}
}
@@ -69,7 +67,7 @@
contentDescription = if (toggleState.value)
stringResource(R.string.content_description_show_password) else
stringResource(R.string.content_description_hide_password),
- tint = LocalAndroidColorScheme.current.colorAccentPrimaryVariant
+ tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
\ No newline at end of file
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ConfirmButton.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ConfirmButton.kt
index 8f48f6b..c09a692 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ConfirmButton.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/ConfirmButton.kt
@@ -16,6 +16,7 @@
package com.android.credentialmanager.common.ui
+import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.FilledTonalButton
@@ -33,11 +34,9 @@
colors = ButtonDefaults.filledTonalButtonColors(
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
- )
+ ),
+ contentPadding = PaddingValues(start = 24.dp, top = 10.dp, end = 24.dp, bottom = 10.dp),
) {
- LargeLabelText(
- text = text,
- modifier = Modifier.padding(vertical = 10.dp, horizontal = 24.dp),
- )
+ LargeLabelText(text = text)
}
}
\ No newline at end of file
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt
index 8061da7..514ff90 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt
@@ -75,7 +75,7 @@
action()
}
IconButton(onClick = onDismiss, modifier = Modifier.padding(
- top = 18.dp, bottom = 18.dp, start = 16.dp, end = 24.dp,
+ top = 4.dp, bottom = 4.dp, start = 2.dp, end = 10.dp,
)) {
Icon(
Icons.Filled.Close,
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt
index 8f7c37e..8af729e 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt
@@ -16,7 +16,7 @@
package com.android.credentialmanager.common.ui
-import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -32,7 +32,7 @@
@Composable
fun HeadlineText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = MaterialTheme.colorScheme.onSurface,
textAlign = TextAlign.Center,
@@ -46,7 +46,7 @@
@Composable
fun BodyMediumText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodyMedium,
@@ -59,7 +59,7 @@
@Composable
fun BodySmallText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodySmall,
@@ -72,7 +72,7 @@
@Composable
fun LargeTitleText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = MaterialTheme.colorScheme.onSurface,
style = MaterialTheme.typography.titleLarge,
@@ -85,7 +85,7 @@
@Composable
fun SmallTitleText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = MaterialTheme.colorScheme.onSurface,
style = MaterialTheme.typography.titleSmall,
@@ -98,7 +98,7 @@
@Composable
fun SectionHeaderText(text: String, modifier: Modifier = Modifier, color: Color) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = color,
style = MaterialTheme.typography.titleSmall,
@@ -111,7 +111,7 @@
@Composable
fun SnackbarContentText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = MaterialTheme.colorScheme.inverseOnSurface,
style = MaterialTheme.typography.bodyMedium,
@@ -124,7 +124,7 @@
@Composable
fun SnackbarActionText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
color = MaterialTheme.colorScheme.inversePrimary,
style = MaterialTheme.typography.labelLarge,
@@ -137,7 +137,7 @@
@Composable
fun LargeLabelTextOnSurfaceVariant(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -151,7 +151,7 @@
@Composable
fun LargeLabelText(text: String, modifier: Modifier = Modifier) {
Text(
- modifier = modifier.wrapContentHeight(),
+ modifier = modifier.wrapContentSize(),
text = text,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.labelLarge,
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
index 54f8e5c..92a6c39 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
@@ -22,7 +22,9 @@
import androidx.activity.result.IntentSenderRequest
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.lazy.LazyColumn
@@ -454,13 +456,13 @@
Snackbar(
action = {
TextButton(
- modifier = Modifier.padding(top = 12.dp, bottom = 12.dp, start = 16.dp),
+ modifier = Modifier.padding(top = 4.dp, bottom = 4.dp, start = 16.dp)
+ .heightIn(min = 32.dp),
onClick = { onClick(true) },
+ contentPadding =
+ PaddingValues(start = 0.dp, top = 6.dp, end = 0.dp, bottom = 6.dp),
) {
- SnackbarActionText(
- text = stringResource(R.string.snackbar_action),
- Modifier.padding(vertical = 6.dp)
- )
+ SnackbarActionText(text = stringResource(R.string.snackbar_action))
}
},
onDismiss = onCancel,