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

Commit ed77a952 authored by Kelly's avatar Kelly
Browse files

Change slider inactive track color to surfaceTone, which is primary color with...

Change slider inactive track color to surfaceTone, which is primary color with opacity 0.14. This can avoid the slider inactive track hidden in the highlight background.

Because the EntryHighlight.kt only affects widget ui, move this file
under spa/widget/util/ folder.

Test: Manually on device
Bug: 253536111
Change-Id: If8230f99e1e31a0f7a08a3d3ff21d9711929626b
parent 6cb6091d
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -44,3 +44,6 @@ internal fun materialColorScheme(isDarkTheme: Boolean): ColorScheme {

val ColorScheme.divider: Color
    get() = onSurface.copy(SettingsOpacity.Divider)

val ColorScheme.surfaceTone: Color
    get() = primary.copy(SettingsOpacity.SurfaceTone)
+1 −0
Original line number Diff line number Diff line
@@ -20,4 +20,5 @@ object SettingsOpacity {
    const val Full = 1f
    const val Disabled = 0.38f
    const val Divider = 0.2f
    const val SurfaceTone = 0.14f
}
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.settingslib.spa.framework.compose.toState
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.util.EntryHighlight
import com.android.settingslib.spa.widget.util.EntryHighlight

@Composable
fun MainSwitchPreference(model: SwitchPreferenceModel) {
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.settingslib.spa.framework.common.EntrySearchData
import com.android.settingslib.spa.framework.compose.navigator
import com.android.settingslib.spa.framework.compose.stateOf
import com.android.settingslib.spa.framework.util.WrapOnClickWithLog
import com.android.settingslib.spa.framework.util.EntryHighlight
import com.android.settingslib.spa.widget.util.EntryHighlight
import com.android.settingslib.spa.widget.ui.createSettingsIcon

data class SimplePreferenceMacro(
+1 −1
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.tooling.preview.Preview
import com.android.settingslib.spa.framework.theme.SettingsTheme
import com.android.settingslib.spa.framework.util.EntryHighlight
import com.android.settingslib.spa.widget.ui.SettingsSlider
import com.android.settingslib.spa.widget.util.EntryHighlight

/**
 * The widget model for [SliderPreference] widget.
Loading