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

Commit 95c12011 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Fix CustomizedAppBar height error" into main

parents ba3e7c0c ef565393

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-alpha02"

    extra["jetpackComposeVersion"] = "1.7.0-alpha03"

}



subprojects {

packages/SettingsLib/Spa/gradle/libs.versions.toml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


[versions]

agp = "8.2.2"

compose-compiler = "1.5.9"

compose-compiler = "1.5.10"

dexmaker-mockito = "2.28.3"

jvm = "17"

kotlin = "1.9.22"

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 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")

    api("androidx.compose.material3:material3:1.3.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

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ private class TopAppBarColors( 
     * @param colorTransitionFraction a `0.0` to `1.0` value that represents a color transition

     * percentage

     */

    @Composable

    @Stable

    fun containerColor(colorTransitionFraction: Float): Color {

        return lerp(

            containerColor,
@@ -519,7 +519,7 @@ private fun TopAppBarLayout( 
                0

            }



        val layoutHeight = if (heightPx.isNaN()) 0 else heightPx.roundToInt()

        val layoutHeight = if (heightPx > 0) heightPx.roundToInt() else 0



        layout(constraints.maxWidth, layoutHeight) {

            // Navigation icon