commit ef5653931508e2d1eca6e27832fbcf4a75749bbb
author Chaohui Wang <chaohuiw@google.com> Tue Feb 27 11:35:27 2024 +0800
committer Chaohui Wang <chaohuiw@google.com> Tue Feb 27 07:34:30 2024 +0000
tree da8eebebc74e9eb87100df68fad1fabd9546442a
parent 0b923ad8f84ae795bd9fc56fc53763f306f1d6e6

[Spa] Fix CustomizedAppBar height error

Although this height should not be negative from code, there still some
crashes happens.

Prevent negative value to prevent crash.

Also import upstream changes up to
Ibe64a4f96541f9379e43c137c6f4f30eeaf1794a

Fix: 322390811
Test: manual - with gallery
Change-Id: I7543b58cf458fc0d884bf2ac9bcafe1734171110

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

diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts
index 2259bd74..a193a2f 100644
--- a/packages/SettingsLib/Spa/spa/build.gradle.kts
+++ b/packages/SettingsLib/Spa/spa/build.gradle.kts
@@ -57,7 +57,7 @@
     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")