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

Commit 05f2be1e authored by Yuchen's avatar Yuchen Committed by Yuchen Sun
Browse files

[expressive design] Update MainSwitchPreference. 

Test: visual
Bug: 360916599
Flag: EXEMPT bug fix
Change-Id: Ic7bb6b784ffa93d4fd1cd54b6070b1eb4d9ebb5c
parent 4aec6911

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

+6 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.spa.widget.preference 


import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.shape.CircleShape

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Surface

import androidx.compose.runtime.Composable
@@ -27,6 +28,7 @@ import androidx.compose.ui.unit.dp 
import com.android.settingslib.spa.framework.theme.SettingsDimension

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

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

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

import com.android.settingslib.spa.framework.util.EntryHighlight



@Composable
@@ -38,16 +40,17 @@ fun MainSwitchPreference(model: SwitchPreferenceModel) { 
                true -> MaterialTheme.colorScheme.primaryContainer

                else -> MaterialTheme.colorScheme.secondaryContainer

            },

            shape = SettingsShape.CornerExtraLarge,

            shape = if (isSpaExpressiveEnabled) CircleShape

            else SettingsShape.CornerExtraLarge,

        ) {

            InternalSwitchPreference(

                title = model.title,

                checked = model.checked(),

                changeable = model.changeable(),

                onCheckedChange = model.onCheckedChange,

                paddingStart = 20.dp,

                paddingStart = if (isSpaExpressiveEnabled) 32.dp else 20.dp,

                paddingEnd = 20.dp,

                paddingVertical = 24.dp,

                paddingVertical = if (isSpaExpressiveEnabled) 16.dp else 24.dp,

            )

        }

    }