Merge branch 'LawnchairLauncher:15-dev' into trunk

Goooler · Dec 7, 2024 · f337f0b · f337f0b
2 parents 4733014 + f2f88cc
commit f337f0b
Show file tree

Hide file tree

Showing 30 changed files with 42,379 additions and 40,170 deletions.
diff --git a/build.gradle b/build.gradle
@@ -42,7 +42,7 @@ allprojects {
     }
 
     plugins.withId('com.google.protobuf') {
-        def protocVersion = '4.29.0'
+        def protocVersion = '4.29.1'
         protobuf {
             // Configure the protoc executable
             protoc {
@@ -362,7 +362,7 @@ dependencies {
     implementation 'androidx.compose.material3:material3-window-size-class'
     implementation "androidx.activity:activity-compose:1.9.3"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"
-    implementation "androidx.navigation:navigation-compose:2.8.4"
+    implementation "androidx.navigation:navigation-compose:2.8.0"
     implementation "androidx.constraintlayout:constraintlayout:2.2.0"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.slice:slice-core:1.1.0-alpha02"

diff --git a/flags/src/com/android/launcher3/FeatureFlagsImpl.java b/flags/src/com/android/launcher3/FeatureFlagsImpl.java
@@ -137,7 +137,7 @@ private void load_overrides_launcher() {
             floatingSearchBar =
                     properties.getBoolean(Flags.FLAG_FLOATING_SEARCH_BAR, false);
             forceMonochromeAppIcons =
-                    properties.getBoolean(Flags.FLAG_FORCE_MONOCHROME_APP_ICONS, false);
+                    properties.getBoolean(Flags.FLAG_FORCE_MONOCHROME_APP_ICONS, true);
             useActivityOverlay =
                     properties.getBoolean(Flags.FLAG_USE_ACTIVITY_OVERLAY, true);
         } catch (NullPointerException e) {