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

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

Merge "[Spa] Fix BrowseActivity animation when starts" into main

parents f812c0c4 6ca54e8b

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.6.0-beta02"

    extra["jetpackComposeVersion"] = "1.6.0-rc01"

}



subprojects {

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#



[versions]

agp = "8.2.0"

agp = "8.2.1"

compose-compiler = "1.5.1"

dexmaker-mockito = "2.28.3"

jvm = "17"

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

+2 −2
Original line number Diff line number Diff line
@@ -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-alpha12")

    api("androidx.compose.material3:material3:1.2.0-beta02")

    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.4")

    api("androidx.navigation:navigation-compose:2.7.6")

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

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt

+3 −0
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ import android.util.Log 
import androidx.activity.ComponentActivity

import androidx.activity.compose.setContent

import androidx.annotation.VisibleForTesting

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.runtime.Composable

import androidx.compose.runtime.CompositionLocalProvider

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.runtime.saveable.rememberSaveable

import androidx.compose.ui.Modifier

import androidx.core.view.WindowCompat

import androidx.navigation.NavBackStackEntry

import androidx.navigation.NavGraph.Companion.findStartDestination
@@ -133,6 +135,7 @@ private fun NavControllerWrapperImpl.NavContent( 
    NavHost(

        navController = navController,

        startDestination = NullPageProvider.name,

        modifier = Modifier.fillMaxSize(),

    ) {

        composable(NullPageProvider.name) {}

        for (spp in allProvider) {

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ fun SettingsPageProvider.createSettingsPage(arguments: Bundle? = null): Settings 
    )

}



object NullPageProvider : SettingsPageProvider {

internal object NullPageProvider : SettingsPageProvider {

    override val name = NULL_PAGE_NAME

}