Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72c2ac12 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge "Reconcile MaterialTheme.colorScheme and AndroidColorScheme (1/2)" into main

parents 1996c0b2 6d09b190

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ import androidx.compose.runtime.rememberCoroutineScope 
import androidx.compose.ui.Modifier

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.Color

import com.android.compose.rememberSystemUiController

import com.android.compose.rememberSystemUiController

import com.android.compose.theme.LocalAndroidColorScheme

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp

import com.android.credentialmanager.common.material.ModalBottomSheetLayout

import com.android.credentialmanager.common.material.ModalBottomSheetLayout

import com.android.credentialmanager.common.material.ModalBottomSheetValue

import com.android.credentialmanager.common.material.ModalBottomSheetValue
@@ -57,7 +56,7 @@ fun ModalBottomSheet( 
        )

        )

        androidx.compose.material3.ModalBottomSheet(

        androidx.compose.material3.ModalBottomSheet(

                onDismissRequest = onDismiss,

                onDismissRequest = onDismiss,

                containerColor = LocalAndroidColorScheme.current.surfaceBright,

                containerColor = MaterialTheme.colorScheme.surfaceBright,

                sheetState = state,

                sheetState = state,

                content = {

                content = {

                    Box(

                    Box(
@@ -91,7 +90,7 @@ fun ModalBottomSheet( 
            setBottomSheetSystemBarsColor(sysUiController)

            setBottomSheetSystemBarsColor(sysUiController)

        }

        }

        ModalBottomSheetLayout(

        ModalBottomSheetLayout(

                sheetBackgroundColor = LocalAndroidColorScheme.current.surfaceBright,

                sheetBackgroundColor = MaterialTheme.colorScheme.surfaceBright,

                modifier = Modifier.background(Color.Transparent),

                modifier = Modifier.background(Color.Transparent),

                sheetState = state,

                sheetState = state,

                sheetContent = { sheetContent() },

                sheetContent = { sheetContent() },

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,12 +29,12 @@ import androidx.compose.foundation.lazy.LazyColumn 
import androidx.compose.foundation.lazy.LazyListScope

import androidx.compose.foundation.lazy.LazyListScope

import androidx.compose.material3.Card

import androidx.compose.material3.Card

import androidx.compose.material3.CardDefaults

import androidx.compose.material3.CardDefaults

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.unit.dp

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.Shapes





/**

/**
@@ -54,7 +54,7 @@ fun SheetContainerCard( 
        modifier = modifier.fillMaxWidth().wrapContentHeight(),

        modifier = modifier.fillMaxWidth().wrapContentHeight(),

        border = null,

        border = null,

        colors = CardDefaults.cardColors(

        colors = CardDefaults.cardColors(

            containerColor = LocalAndroidColorScheme.current.surfaceBright,

            containerColor = MaterialTheme.colorScheme.surfaceBright,

        ),

        ),

    ) {

    ) {

        if (topAppBar != null) {

        if (topAppBar != null) {

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.compose.material.icons.Icons 
import androidx.compose.material.icons.outlined.Lock

import androidx.compose.material.icons.outlined.Lock

import androidx.compose.material3.Icon

import androidx.compose.material3.Icon

import androidx.compose.material3.IconButton

import androidx.compose.material3.IconButton

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.SuggestionChip

import androidx.compose.material3.SuggestionChip

import androidx.compose.material3.SuggestionChipDefaults

import androidx.compose.material3.SuggestionChipDefaults

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable
@@ -52,7 +53,6 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation 
import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.LayoutDirection

import androidx.compose.ui.unit.LayoutDirection

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.credentialmanager.ui.theme.EntryShape

import com.android.credentialmanager.ui.theme.EntryShape

import com.android.credentialmanager.ui.theme.Shapes

import com.android.credentialmanager.ui.theme.Shapes
@@ -172,7 +172,7 @@ fun Entry( 
                            // Decorative purpose only.

                            // Decorative purpose only.

                            contentDescription = null,

                            contentDescription = null,

                            modifier = Modifier.size(24.dp),

                            modifier = Modifier.size(24.dp),

                            tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                            tint = MaterialTheme.colorScheme.onSurfaceVariant,

                        )

                        )

                    }

                    }

                }

                }
@@ -186,7 +186,7 @@ fun Entry( 
                        Icon(

                        Icon(

                            modifier = iconSize,

                            modifier = iconSize,

                            bitmap = iconImageBitmap,

                            bitmap = iconImageBitmap,

                            tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                            tint = MaterialTheme.colorScheme.onSurfaceVariant,

                            // Decorative purpose only.

                            // Decorative purpose only.

                            contentDescription = null,

                            contentDescription = null,

                        )

                        )
@@ -210,7 +210,7 @@ fun Entry( 
                    Icon(

                    Icon(

                        modifier = iconSize,

                        modifier = iconSize,

                        imageVector = iconImageVector,

                        imageVector = iconImageVector,

                        tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                        tint = MaterialTheme.colorScheme.onSurfaceVariant,

                        // Decorative purpose only.

                        // Decorative purpose only.

                        contentDescription = null,

                        contentDescription = null,

                    )

                    )
@@ -222,7 +222,7 @@ fun Entry( 
                    Icon(

                    Icon(

                        modifier = iconSize,

                        modifier = iconSize,

                        painter = iconPainter,

                        painter = iconPainter,

                        tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                        tint = MaterialTheme.colorScheme.onSurfaceVariant,

                        // Decorative purpose only.

                        // Decorative purpose only.

                        contentDescription = null,

                        contentDescription = null,

                    )

                    )
@@ -233,9 +233,9 @@ fun Entry( 
        },

        },

        border = null,

        border = null,

        colors = SuggestionChipDefaults.suggestionChipColors(

        colors = SuggestionChipDefaults.suggestionChipColors(

            containerColor = LocalAndroidColorScheme.current.surfaceContainerHigh,

            containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,

            labelColor = LocalAndroidColorScheme.current.onSurfaceVariant,

            labelColor = MaterialTheme.colorScheme.onSurfaceVariant,

            iconContentColor = LocalAndroidColorScheme.current.onSurfaceVariant,

            iconContentColor = MaterialTheme.colorScheme.onSurfaceVariant,

        ),

        ),

    )

    )

}

}
@@ -338,7 +338,7 @@ fun MoreOptionTopAppBar( 
                        imageVector = navigationIcon,

                        imageVector = navigationIcon,

                        contentDescription = navigationIconContentDescription,

                        contentDescription = navigationIconContentDescription,

                        modifier = Modifier.size(24.dp).autoMirrored(),

                        modifier = Modifier.size(24.dp).autoMirrored(),

                        tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                        tint = MaterialTheme.colorScheme.onSurfaceVariant,

                )

                )

            }

            }

        }

        }

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -21,23 +21,23 @@ import androidx.compose.foundation.layout.fillMaxWidth 
import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.wrapContentHeight

import androidx.compose.foundation.layout.wrapContentHeight

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import androidx.compose.material3.MaterialTheme

import androidx.compose.ui.Modifier

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp

import com.android.compose.theme.LocalAndroidColorScheme





@Composable

@Composable

fun CredentialListSectionHeader(text: String, isFirstSection: Boolean) {

fun CredentialListSectionHeader(text: String, isFirstSection: Boolean) {

    InternalSectionHeader(

    InternalSectionHeader(

        text = text,

        text = text,

        color = LocalAndroidColorScheme.current.onSurfaceVariant,

        color = MaterialTheme.colorScheme.onSurfaceVariant,

        applyTopPadding = !isFirstSection

        applyTopPadding = !isFirstSection

    )

    )

}

}





@Composable

@Composable

fun MoreAboutPasskeySectionHeader(text: String) {

fun MoreAboutPasskeySectionHeader(text: String) {

    InternalSectionHeader(text, LocalAndroidColorScheme.current.onSurface)

    InternalSectionHeader(text, MaterialTheme.colorScheme.onSurface)

}

}





@Composable

@Composable

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,9 +17,9 @@ 
package com.android.credentialmanager.common.ui

package com.android.credentialmanager.common.ui





import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import androidx.compose.material3.MaterialTheme

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.Color

import com.android.compose.SystemUiController

import com.android.compose.SystemUiController

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.credentialmanager.common.material.ModalBottomSheetDefaults

import com.android.credentialmanager.common.material.ModalBottomSheetDefaults





@Composable

@Composable
@@ -34,7 +34,7 @@ fun setBottomSheetSystemBarsColor(sysUiController: SystemUiController) { 
        darkIcons = false

        darkIcons = false

    )

    )

    sysUiController.setNavigationBarColor(

    sysUiController.setNavigationBarColor(

        color = LocalAndroidColorScheme.current.surfaceBright,

        color = MaterialTheme.colorScheme.surfaceBright,

        darkIcons = false

        darkIcons = false

    )

    )

}
 
}
 
 No newline at end of file