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

Commit beb79048 authored by Yuchen Sun's avatar Yuchen Sun Committed by Android (Google) Code Review
Browse files

Merge "[expressive design] Update back button in App bar." into main

parents 45f89d89 e7a4484e

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

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ object SettingsDimension { 
    val spinnerHorizontalPadding = paddingExtraLarge

    val spinnerVerticalPadding = paddingLarge



    val actionIconWidth = 32.dp

    val actionIconHeight = 40.dp

    val actionIconPadding = 4.dp



    val itemIconSize = 24.dp

    val itemIconContainerSize = 72.dp

    val itemPaddingStart = paddingExtraLarge

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

+14 −0
Original line number Diff line number Diff line
@@ -17,15 +17,24 @@ 
package com.android.settingslib.spa.widget.scaffold



import androidx.appcompat.R

import androidx.compose.foundation.background

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.size

import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.automirrored.outlined.ArrowBack

import androidx.compose.material.icons.outlined.Clear

import androidx.compose.material.icons.outlined.FindInPage

import androidx.compose.material3.Icon

import androidx.compose.material3.IconButton

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.clip

import androidx.compose.ui.res.stringResource

import com.android.settingslib.spa.framework.compose.LocalNavController

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

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

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



/** Action that navigates back to last page. */

@Composable
@@ -50,6 +59,11 @@ private fun BackAction(contentDescription: String, onClick: () -> Unit) { 
        Icon(

            imageVector = Icons.AutoMirrored.Outlined.ArrowBack,

            contentDescription = contentDescription,

            modifier = if (isSpaExpressiveEnabled) Modifier

                .size(SettingsDimension.actionIconWidth, SettingsDimension.actionIconHeight)

                .clip(SettingsShape.CornerExtraLarge)

                .background(MaterialTheme.colorScheme.onSurfaceVariant)

                .padding(SettingsDimension.actionIconPadding) else Modifier

        )

    }

}