diff options
3 files changed, 6 insertions, 24 deletions
diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts index 80b944f5749f..60bf48c8b75e 100644 --- a/packages/SettingsLib/Spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/build.gradle.kts @@ -25,11 +25,11 @@ plugins { alias(libs.plugins.kotlin.android) apply false } -val androidTop : String = File(rootDir, "../../../../..").canonicalPath +val androidTop: String = File(rootDir, "../../../../..").canonicalPath allprojects { extra["androidTop"] = androidTop - extra["jetpackComposeVersion"] = "1.6.0-alpha08" + extra["jetpackComposeVersion"] = "1.6.0-beta01" } subprojects { diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts index 4335173dd706..acd90f3c4f4d 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts @@ -57,13 +57,13 @@ dependencies { api("androidx.slice:slice-builders:1.1.0-alpha02") api("androidx.slice:slice-core:1.1.0-alpha02") api("androidx.slice:slice-view:1.1.0-alpha02") - api("androidx.compose.material3:material3:1.2.0-alpha10") + api("androidx.compose.material3:material3:1.2.0-alpha11") api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion") api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion") api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion") api("androidx.lifecycle:lifecycle-livedata-ktx") api("androidx.lifecycle:lifecycle-runtime-compose") - api("androidx.navigation:navigation-compose:2.7.5") + api("androidx.navigation:navigation-compose:2.7.4") api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha") api("com.google.android.material:material:1.7.0-alpha03") debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion") diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt index 26372b6bfd32..c395558b769c 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt @@ -17,9 +17,7 @@ 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.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -39,7 +37,7 @@ fun SettingsTheme(content: @Composable () -> Unit) { MaterialTheme(colorScheme = colorScheme, typography = rememberSettingsTypography()) { CompositionLocalProvider( LocalColorScheme provides settingsColorScheme(isDarkTheme), - LocalRippleTheme provides SettingsRippleTheme, + LocalContentColor provides MaterialTheme.colorScheme.onSurface, ) { content() } @@ -52,19 +50,3 @@ 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, -) |