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

Commit d12594aa authored by shirleyqian's avatar shirleyqian
Browse files

Update icon and text colors on ambient cue. 

Bug: 422231781
Test: local
Flag: com.android.systemui.enable_underlay
Change-Id: I06cc71be3335fd64456919d7f2b0a075c88ee050
parent 9b4004d2

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/Chip.kt

+2 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.systemui.ambientcue.ui.viewmodel.ActionViewModel 


@Composable

fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) {

    val outlineColor = if (isSystemInDarkTheme()) Color.White else Color.Black

    val backgroundColor = if (isSystemInDarkTheme()) Color.Black else Color.White



    Row(
@@ -80,7 +79,7 @@ fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) { 
            Text(

                action.label,

                style = MaterialTheme.typography.labelLarge,

                color = outlineColor,

                color = MaterialTheme.colorScheme.onSurface,

                maxLines = if (hasAttribution) 1 else 2,

                overflow = TextOverflow.Ellipsis,

            )
@@ -88,7 +87,7 @@ fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) { 
                Text(

                    action.attribution!!,

                    style = MaterialTheme.typography.labelLarge,

                    color = outlineColor,

                    color = MaterialTheme.colorScheme.onSurfaceVariant,

                    maxLines = 1,

                    modifier = Modifier.alpha(0.8f),

                    overflow = TextOverflow.Ellipsis,

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/NavBarPill.kt

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ fun NavBarPill( 
                                            .clip(RoundedCornerShape(16.dp))

                                            .background(

                                                if (hasBackground) {

                                                    MaterialTheme.colorScheme.surfaceContainer

                                                    MaterialTheme.colorScheme.surfaceContainerLow

                                                } else {

                                                    Color.Transparent

                                                }
@@ -203,7 +203,7 @@ fun NavBarPill( 
                                            style = MaterialTheme.typography.labelMedium,

                                            maxLines = 1,

                                            overflow = TextOverflow.Ellipsis,

                                            color = MaterialTheme.colorScheme.onSurface,

                                            color = MaterialTheme.colorScheme.onSurfaceVariant,

                                            modifier = Modifier.alpha(0.4f),

                                        )

                                    }

packages/SystemUI/res-keyguard/drawable/ic_paste_spark.xml

+5 −5
Original line number Diff line number Diff line
@@ -23,18 +23,18 @@ 
>

    <path

        android:pathData="M0,0h24v24h-24z"

        android:fillColor="@androidprv:color/materialColorTertiary"/>

        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>

    <group android:scaleX="0.75" android:scaleY="0.75" android:pivotX="12" android:pivotY="12">

        <clip-path

            android:pathData="M0,0h24v24h-24z"/>

        <path

            android:pathData="M19.5,4.5C18.5,3.5 18,2.3 18,1C18,2.4 17.5,3.6 16.5,4.5C15.5,5.5 14.3,6 13,6C14.4,6 15.6,6.5 16.5,7.5C17.4,8.5 18,9.7 18,11C18,9.6 18.5,8.4 19.5,7.5C20.5,6.6 21.7,6 23,6C21.6,6 20.4,5.5 19.5,4.5Z"

            android:fillColor="@androidprv:color/materialColorOnTertiary"/>

            android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"/>

        <path

            android:pathData="M14.32,10.4C14.83,10 14.2,9.2 13.69,9.59C11.18,11.4 9.16,12.55 7,13.72V3H15V1H7C5.9,1 5,1.9 5,3V8.19C3.74,9.44 2.65,10.81 1.79,12.4C1.01,13.7 0.33,16.28 2.32,16.86C3.25,17.11 4.14,16.82 4.92,16.53C5.03,16.48 7.5,15.83 14.32,10.4ZM3.01,15.01C3.32,13.82 4.08,12.68 5,11.65V14.63C4.35,14.86 3.69,15.01 3.01,15.01Z"

            android:fillColor="@androidprv:color/materialColorOnTertiary"/>

            android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"/>

        <path

            android:pathData="M16,21H7V17.78C5.81,18.37 5.52,18.46 5,18.62V21C5,22.1 5.9,23 7,23H16C17.1,23 18,22.1 18,21V12H16V21Z"

            android:fillColor="@androidprv:color/materialColorOnTertiary"/>

            android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"/>

    </group>

</vector>
 
 No newline at end of file