Guillermo Villafuerte
7d0c1829a8
Merge remote-tracking branch 'upstream/main' into feat/materialYouCompat
Signed-off-by: Guillermo Villafuerte <gvillafu@comunidad.unam.mx>
# Conflicts:
# app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
# app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt
# core/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt
# core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt