diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml index bffd563ec2..8f151db5e2 100644 --- a/lawnchair/res/values/config.xml +++ b/lawnchair/res/values/config.xml @@ -47,6 +47,9 @@ gregorian + + + false true false diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt index 392fc9051e..4125f859ac 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt @@ -114,11 +114,7 @@ class PreferenceManager2(private val context: Context) : PreferenceManager { parse = ColorOption::fromString, save = ColorOption::toString, onSet = { reloadHelper.recreate() }, - defaultValue = when { - Utilities.ATLEAST_S -> ColorOption.SystemAccent - Utilities.ATLEAST_O_MR1 -> ColorOption.WallpaperPrimary - else -> ColorOption.LawnchairBlue - }, + defaultValue = ColorOption.fromString(context.getString(R.string.config_default_accent_color)), ) val hiddenApps = preference( diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt index 4aa8b864c7..6e05e37c38 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt +++ b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt @@ -80,7 +80,11 @@ sealed class ColorOption { } catch (e: IllegalArgumentException) { // ignore } - return SystemAccent + return when { + Utilities.ATLEAST_S -> SystemAccent + Utilities.ATLEAST_O_MR1 -> WallpaperPrimary + else -> LawnchairBlue + } } } }