Add preference to disable themed icons for themed icon packs

core/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt

@@ -22,7 +22,7 @@ internal val Context.dataStore: LauncherDataStore by dataStore(
     }
 )
 
-internal const val SchemaVersion = 13
+internal const val SchemaVersion = 14
 
 internal fun getMigrations(context: Context): List<DataMigration<Settings>> {
     return listOf(
@@ -39,5 +39,6 @@ internal fun getMigrations(context: Context): List<DataMigration<Settings>> {
         Migration_10_11(),
         Migration_11_12(),
         Migration_12_13(),
+        Migration_13_14(),
     )
 }

core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt

@@ -145,6 +145,7 @@ fun createFactorySettings(context: Context): Settings {
                 .setShape(Settings.IconSettings.IconShape.PlatformDefault)
                 .setThemedIcons(false)
                 .setIconPack("")
+                .setIconPackThemed(true)
         )
         .setEasterEgg(false)
         .setSystemBars(

core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_13_14.kt

@@ -0,0 +1,13 @@
+package de.mm20.launcher2.preferences.migrations
+
+import de.mm20.launcher2.preferences.Settings
+
+class Migration_13_14 : VersionedMigration(13, 14) {
+    override suspend fun applyMigrations(builder: Settings.Builder): Settings.Builder {
+        return builder
+            .setIcons(
+                builder.icons.toBuilder()
+                    .setIconPackThemed(true)
+            )
+    }
+}

core/preferences/src/main/proto/settings.proto

@@ -246,6 +246,7 @@ message Settings {
     reserved 4;
     bool adaptify = 5;
     bool force_themed = 6;
+    bool icon_pack_themed = 7;
   }
   IconSettings icons = 21;