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

Commit 67f04bee authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Animate color change of mode activation/deactivation" into main

parents 5c132c67 b4e988b7
Loading
Loading
Loading
Loading
+13 −6
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package com.android.systemui.statusbar.policy.ui.dialog.composable

import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.basicMarquee
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Arrangement
@@ -30,8 +31,10 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.semantics.contentDescription
@@ -44,12 +47,16 @@ import com.android.systemui.statusbar.policy.ui.dialog.viewmodel.ModeTileViewMod

@Composable
fun ModeTile(viewModel: ModeTileViewModel) {
    val tileColor =
    val tileColor: Color by
        animateColorAsState(
            if (viewModel.enabled) MaterialTheme.colorScheme.primary
            else MaterialTheme.colorScheme.surfaceVariant
    val contentColor =
        )
    val contentColor: Color by
        animateColorAsState(
            if (viewModel.enabled) MaterialTheme.colorScheme.onPrimary
            else MaterialTheme.colorScheme.onSurfaceVariant
        )

    CompositionLocalProvider(LocalContentColor provides contentColor) {
        Surface(