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

Commit a53c8d47 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

[Spa] Replace deprecated MenuAnchorType 

Also,
- Upgrade AGP to 8.8.0
- Upgrade Java to 21

Bug: 373245944
Flag: EXEMPT clean up
Test: Gradle Sync
Test: Run Gallery
Change-Id: I8a5a8484d314e0a492bd839366c4fa7b408d2caa
parent 95520e87

packages/SettingsLib/Spa/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
/.idea/workspace.xml

/.idea/navEditor.xml

/.idea/assetWizardSettings.xml

/.kotlin

.DS_Store

build

/captures

packages/SettingsLib/Spa/build.gradle.kts

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


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.8.0-alpha06"

    extra["jetpackComposeVersion"] = "1.8.0-alpha08"

}



subprojects {

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

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
#



[versions]

agp = "8.7.3"

agp = "8.8.0"

dexmaker-mockito = "2.28.3"

jvm = "17"

jvm = "21"

kotlin = "2.0.21"

truth = "1.4.4"

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

+2 −2
Original line number Diff line number Diff line
@@ -52,14 +52,14 @@ android { 
dependencies {

    api(project(":SettingsLibColor"))

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

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

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

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

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

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

    api("androidx.graphics:graphics-shapes-android:1.0.1")

    api("androidx.lifecycle:lifecycle-livedata-ktx")

    api("androidx.lifecycle:lifecycle-runtime-compose")

    api("androidx.navigation:navigation-compose:2.9.0-alpha03")

    api("androidx.navigation:navigation-compose:2.9.0-alpha04")

    api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")

    api("com.google.android.material:material:1.13.0-alpha08")

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

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/editor/DropdownTextBox.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ import androidx.compose.foundation.layout.fillMaxWidth 
import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.width

import androidx.compose.material3.ExperimentalMaterial3Api

import androidx.compose.material3.ExposedDropdownMenuAnchorType

import androidx.compose.material3.ExposedDropdownMenuBox

import androidx.compose.material3.ExposedDropdownMenuDefaults

import androidx.compose.material3.MenuAnchorType

import androidx.compose.material3.OutlinedTextField

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable
@@ -66,7 +66,7 @@ internal fun DropdownTextBox( 
        OutlinedTextField(

            // The `menuAnchor` modifier must be passed to the text field for correctness.

            modifier = Modifier

                .menuAnchor(MenuAnchorType.PrimaryNotEditable)

                .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)

                .fillMaxWidth(),

            value = text,

            onValueChange = { },