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

Commit b95485ff authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge changes from topic "278574288" into udc-qpr-dev 

* changes:
  Migrate to new color tokens
  Dialog color tokens
parents 38faa74b 857efe65

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt

+8 −9
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ fun FooterActions( 
        }

    }



    val backgroundColor = colorAttr(R.attr.underSurfaceColor)

    val contentColor = LocalAndroidColorScheme.current.deprecated.textColorPrimary

    val backgroundColor = colorAttr(R.attr.underSurface)

    val contentColor = LocalAndroidColorScheme.current.onSurface

    val backgroundTopRadius = dimensionResource(R.dimen.qs_corner_radius)

    val backgroundModifier =

        remember(
@@ -268,7 +268,7 @@ private fun NumberButton( 
    val interactionSource = remember { MutableInteractionSource() }



    Expandable(

        color = colorAttr(R.attr.offStateColor),

        color = colorAttr(R.attr.shadeInactive),

        shape = CircleShape,

        onClick = onClick,

        interactionSource = interactionSource,
@@ -287,7 +287,7 @@ private fun NumberButton( 
                    number.toString(),

                    modifier = Modifier.align(Alignment.Center),

                    style = MaterialTheme.typography.bodyLarge,

                    color = LocalAndroidColorScheme.current.deprecated.textColorPrimary,

                    color = colorAttr(R.attr.onShadeInactiveVariant),

                    // TODO(b/242040009): This should only use a standard text style instead and

                    // should not override the text size.

                    fontSize = 18.sp,
@@ -305,7 +305,7 @@ private fun NumberButton( 
@Composable

private fun NewChangesDot(modifier: Modifier = Modifier) {

    val contentDescription = stringResource(R.string.fgs_dot_content_description)

    val color = LocalAndroidColorScheme.current.deprecated.colorAccentTertiary

    val color = LocalAndroidColorScheme.current.tertiary



    Canvas(modifier.size(12.dp).semantics { this.contentDescription = contentDescription }) {

        drawCircle(color)
@@ -323,10 +323,9 @@ private fun TextButton( 
) {

    Expandable(

        shape = CircleShape,

        color = colorAttr(R.attr.underSurfaceColor),

        contentColor = LocalAndroidColorScheme.current.deprecated.textColorSecondary,

        borderStroke =

            BorderStroke(1.dp, LocalAndroidColorScheme.current.deprecated.colorBackground),

        color = colorAttr(R.attr.underSurface),

        contentColor = LocalAndroidColorScheme.current.onSurfaceVariant,

        borderStroke = BorderStroke(1.dp, colorAttr(R.attr.onShadeActive)),

        modifier = modifier.padding(horizontal = 4.dp),

        onClick = onClick,

    ) {

packages/SystemUI/res-keyguard/color/shade_disabled.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2023 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.

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@android:color/system_neutral1_500" android:lStar="4" />

</selector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/layout/footer_actions_number_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

        android:layout_gravity="center"

        android:textColor="?android:attr/textColorPrimary"

        android:textColor="?attr/onShadeInactiveVariant"

        android:textSize="18sp"/>

    <ImageView

        android:id="@+id/new_dot"

packages/SystemUI/res-keyguard/layout/footer_actions_text_button.xml

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:layout_marginEnd="12dp"

        android:contentDescription="@null"

        android:src="@drawable/ic_info_outline"

        android:tint="?android:attr/textColorSecondary" />

        android:tint="?attr/onSurfaceVariant" />



    <TextView

        android:id="@+id/text"
@@ -43,7 +43,7 @@ 
        android:maxLines="1"

        android:ellipsize="end"

        android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

        android:textColor="?android:attr/textColorSecondary"/>

        android:textColor="?attr/onSurfaceVariant"/>



    <ImageView

        android:id="@+id/new_dot"
@@ -62,5 +62,5 @@ 
        android:contentDescription="@null"

        android:src="@*android:drawable/ic_chevron_end"

        android:autoMirrored="true"

        android:tint="?android:attr/textColorSecondary" />

        android:tint="?attr/onSurfaceVariant" />

</com.android.systemui.animation.view.LaunchableLinearLayout>
 
 No newline at end of file

packages/SystemUI/res/drawable/brightness_mirror_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
  ~ limitations under the License

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <solid android:color="?attr/underSurfaceColor" />

    <solid android:color="?attr/underSurface" />

    <corners android:radius="@dimen/rounded_slider_background_rounded_corner" />

</shape>