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

Commit 535e9738 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Align Spa pages with Settings ripple theme 

Fix: 269075631
Test: Manually with Gallery
Test: Manually with Settings
Change-Id: Ia73a43e77b37a1200d87c2320bbc69696b205ca7
parent fd4d3eaa

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt

+24 −2
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
package com.android.settingslib.spa.framework.theme



import androidx.compose.foundation.isSystemInDarkTheme

import androidx.compose.material.ripple.LocalRippleTheme

import androidx.compose.material.ripple.RippleAlpha

import androidx.compose.material.ripple.RippleTheme

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.runtime.CompositionLocalProvider
@@ -33,8 +36,11 @@ fun SettingsTheme(content: @Composable () -> Unit) { 
        background = settingsColorScheme.background,

    )



    CompositionLocalProvider(LocalColorScheme provides settingsColorScheme(isDarkTheme)) {

    MaterialTheme(colorScheme = colorScheme, typography = rememberSettingsTypography()) {

        CompositionLocalProvider(

            LocalColorScheme provides settingsColorScheme(isDarkTheme),

            LocalRippleTheme provides SettingsRippleTheme,

        ) {

            content()

        }

    }
@@ -46,3 +52,19 @@ object SettingsTheme { 
        @ReadOnlyComposable

        get() = LocalColorScheme.current

}



private object SettingsRippleTheme : RippleTheme {

    @Composable

    override fun defaultColor() = MaterialTheme.colorScheme.onSurface



    @Composable

    override fun rippleAlpha() = RippleAlpha

}



/** Alpha levels for all content. */

private val RippleAlpha = RippleAlpha(

    pressedAlpha = 0.48f,

    focusedAlpha = 0.48f,

    draggedAlpha = 0.32f,

    hoveredAlpha = 0.16f,

)