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

Commit 7c10e57c authored by Chaohui Wang's avatar Chaohui Wang
Browse files

[Spa] Correct the CornerExtraLarge to 28dp 

Also prevent double auto mirror for BackAction.

Bug: 304200229
Test: Run Gallery
Change-Id: Ia629959f7c803325717c6e24ca049a96cf971520
parent 2372b07d

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,5 +22,5 @@ import androidx.compose.ui.unit.dp 
object SettingsShape {

object SettingsShape {

    val CornerMedium = RoundedCornerShape(12.dp)

    val CornerMedium = RoundedCornerShape(12.dp)





    val CornerLarge = RoundedCornerShape(24.dp)

    val CornerExtraLarge = RoundedCornerShape(28.dp)

}
 
}

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/button/ActionButtons.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ fun ActionButtons(actionButtons: List<ActionButton>) { 
    Row(

    Row(

        Modifier

        Modifier

            .padding(SettingsDimension.buttonPadding)

            .padding(SettingsDimension.buttonPadding)

            .clip(SettingsShape.CornerLarge)

            .clip(SettingsShape.CornerExtraLarge)

            .height(IntrinsicSize.Min)

            .height(IntrinsicSize.Min)

    ) {

    ) {

        for ((index, actionButton) in actionButtons.withIndex()) {

        for ((index, actionButton) in actionButtons.withIndex()) {

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/MainSwitchPreference.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ fun MainSwitchPreference(model: SwitchPreferenceModel) { 
                true -> MaterialTheme.colorScheme.primaryContainer

                true -> MaterialTheme.colorScheme.primaryContainer

                else -> MaterialTheme.colorScheme.secondaryContainer

                else -> MaterialTheme.colorScheme.secondaryContainer

            },

            },

            shape = SettingsShape.CornerLarge,

            shape = SettingsShape.CornerExtraLarge,

        ) {

        ) {

            InternalSwitchPreference(

            InternalSwitchPreference(

                title = model.title,

                title = model.title,

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

+1 −14
Original line number Original line Diff line number Diff line
@@ -18,19 +18,14 @@ package com.android.settingslib.spa.widget.scaffold 




import androidx.appcompat.R

import androidx.appcompat.R

import androidx.compose.material.icons.Icons

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.Clear

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

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

import androidx.compose.material3.Icon

import androidx.compose.material3.Icon

import androidx.compose.material3.IconButton

import androidx.compose.material3.IconButton

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.composed

import androidx.compose.ui.draw.scale

import androidx.compose.ui.platform.LocalLayoutDirection

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.unit.LayoutDirection

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

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

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





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

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

@Composable

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

        Icon(

            imageVector = Icons.AutoMirrored.Outlined.ArrowBack,

            imageVector = Icons.AutoMirrored.Outlined.ArrowBack,

            contentDescription = contentDescription,

            contentDescription = contentDescription,

            modifier = Modifier.autoMirrored(),

        )

        )

    }

    }

}

}
@@ -81,10 +75,3 @@ internal fun ClearAction(onClick: () -> Unit) { 
        )

        )

    }

    }

}
 
}
 


private fun Modifier.autoMirrored() = composed {

    when (LocalLayoutDirection.current) {

        LayoutDirection.Rtl -> scale(scaleX = -1f, scaleY = 1f)

        else -> this

    }

}