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

Commit 80d4245f authored by Chaohui Wang's avatar Chaohui Wang
Browse files

[Spa] Polish Footer specs 

Bug: 419002002
Flag: EXEMPT bug fix
Test: manual - with Settings
Change-Id: I10c04bb194a3cf1b0dd3604cdb64826b1e0e38da
parent c36242fc

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

+6 −10
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ object SettingsDimension { 
    val paddingSmall = if (isSpaExpressiveEnabled) 8.dp else 4.dp

    val paddingLarge = 16.dp

    val paddingExtraLarge = 24.dp

    val paddingExtraLarge1 = 28.dp



    val actionIconSize = 40.dp

    val actionIconPadding = 8.dp



    val itemIconSize = 24.dp

    val itemIconContainerSizeSmall = 40.dp
@@ -42,12 +38,12 @@ object SettingsDimension { 
        end = itemPaddingEnd,

        bottom = itemPaddingVertical,

    )

    val footerItemPadding = PaddingValues(

        start = paddingExtraLarge1,

        top = itemPaddingVertical,

        end = itemPaddingEnd,

        bottom = itemPaddingVertical,

    )

    val footerPadding =

        if (isSpaExpressiveEnabled) {

            PaddingValues(horizontal = SettingsSpace.small4, vertical = SettingsSpace.small1)

        } else {

            itemPadding

        }

    val textFieldPadding = PaddingValues(

        start = itemPaddingStart,

        end = itemPaddingEnd,

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Footer.kt

+10 −2
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.Modifier

import androidx.compose.ui.tooling.preview.Preview

import com.android.settingslib.spa.framework.theme.SettingsDimension

import com.android.settingslib.spa.framework.theme.SettingsSpace

import com.android.settingslib.spa.framework.theme.SettingsTheme

import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled



@Composable

fun Footer(footerText: String) {
@@ -41,14 +43,20 @@ fun Footer(footerText: String) { 


@Composable

fun Footer(content: @Composable () -> Unit) {

    Column(Modifier.padding(SettingsDimension.itemPadding)) {

    Column(Modifier.padding(SettingsDimension.footerPadding)) {

        Icon(

                imageVector = Icons.Outlined.Info,

                contentDescription = null,

                modifier = Modifier.size(SettingsDimension.itemIconSize),

                tint = MaterialTheme.colorScheme.onSurfaceVariant,

        )

        Spacer(modifier = Modifier.height(SettingsDimension.itemPaddingVertical))

        val spaceHeight =

            if (isSpaExpressiveEnabled) {

                SettingsSpace.extraSmall4

            } else {

                SettingsDimension.paddingLarge

            }

        Spacer(modifier = Modifier.height(spaceHeight))

        content()

    }

}

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

+1 −5
Original line number Diff line number Diff line
@@ -134,11 +134,7 @@ class AppInfoProvider(private val packageInfo: PackageInfo) { 
            }

        if (footer.isBlank()) return

        if (!isSpaExpressiveEnabled) HorizontalDivider()

        Column(

            modifier =

                if (isSpaExpressiveEnabled) Modifier.padding(SettingsDimension.footerItemPadding)

                else Modifier.padding(SettingsDimension.itemPadding)

        ) {

        Box(modifier = Modifier.padding(SettingsDimension.footerPadding)) {

            CopyableBody(footer)

        }

    }