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

Commit c8dbe826 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[expressive design] Update compose version." into main

parents bcfd7432 5826bdb1

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath 


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.7.0"

    extra["jetpackComposeVersion"] = "1.7.3"

}



subprojects {

packages/SettingsLib/Spa/spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ android { 
dependencies {

    api(project(":SettingsLibColor"))

    api("androidx.appcompat:appcompat:1.7.0")

    api("androidx.compose.material3:material3:1.3.0")

    api("androidx.compose.material3:material3:1.4.0-alpha01")

    api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")

    api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")

    api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion")

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/CustomizedAppBar.kt

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior 
import androidx.compose.material3.TopAppBarState

import androidx.compose.runtime.Composable

import androidx.compose.runtime.CompositionLocalProvider

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.NonRestartableComposable

import androidx.compose.runtime.Stable

import androidx.compose.runtime.derivedStateOf
@@ -326,6 +327,9 @@ private fun TwoRowsTopAppBar( 
    // Sets the app bar's height offset limit to hide just the bottom title area and keep top title

    // visible when collapsed.

    scrollBehavior?.state?.heightOffsetLimit = pinnedHeightPx - maxHeightPx.floatValue

    if (isSpaExpressiveEnabled) {

        LaunchedEffect(scrollBehavior?.state?.heightOffsetLimit) { scrollBehavior?.collapse() }

    }



    // Obtain the container Color from the TopAppBarColors using the `collapsedFraction`, as the

    // bottom part of this TwoRowsTopAppBar changes color at the same rate the app bar expands or

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsScaffold.kt

+0 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import androidx.compose.ui.tooling.preview.Preview 
import com.android.settingslib.spa.framework.compose.horizontalValues

import com.android.settingslib.spa.framework.compose.verticalValues

import com.android.settingslib.spa.framework.theme.SettingsTheme

import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled

import com.android.settingslib.spa.framework.theme.settingsBackground

import com.android.settingslib.spa.widget.preference.Preference

import com.android.settingslib.spa.widget.preference.PreferenceModel
@@ -56,9 +55,6 @@ fun SettingsScaffold( 
) {

    ActivityTitle(title)

    val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()

    if (isSpaExpressiveEnabled) {

        LaunchedEffect(scrollBehavior.state.heightOffsetLimit) { scrollBehavior.collapse() }

    }



    Scaffold(

        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),