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

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

Merge "Fix SpaLib build after Compose 1.3.0"

parents 65ff129f 507227d8

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ fun SettingsScaffold( 
    )

}



@OptIn(ExperimentalMaterial3Api::class)

@Composable

internal fun settingsTopAppBarColors() = TopAppBarDefaults.largeTopAppBarColors(

    containerColor = SettingsTheme.colorScheme.surfaceHeader,

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfoPage.kt

+5 −4
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ fun AppInfoPage( 
) {

    RegularScaffold(title = title) {

        val appInfoProvider = remember {

            val packageInfo = PackageManagers.getPackageInfoAsUser(packageName, userId)

                ?: return@RegularScaffold

            PackageManagers.getPackageInfoAsUser(packageName, userId)?.let { packageInfo ->

                AppInfoProvider(packageInfo)

            }

        } ?: return@RegularScaffold



        appInfoProvider.AppInfo(displayVersion = true)



        content()

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt

+5 −3
Original line number Diff line number Diff line
@@ -143,9 +143,11 @@ private fun <T : AppRecord> createSwitchModel( 
    userId: Int,

): TogglePermissionSwitchModel<T>? {

    val record = remember {

        val app = PackageManagers.getApplicationInfoAsUser(packageName, userId) ?: return null

        PackageManagers.getApplicationInfoAsUser(packageName, userId)?.let { app ->

            listModel.transformItem(app)

        }

    } ?: return null



    val context = LocalContext.current

    val isAllowed = listModel.isAllowed(record)

    return remember {