Merge branch 'LawnchairLauncher:15-dev' into trunk

Goooler · Jan 8, 2025 · fe274db · fe274db
2 parents 7182679 + 7a4d119
commit fe274db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
@@ -145,7 +145,7 @@ class PreferenceManager2 private constructor(private val context: Context) :
         key = stringPreferencesKey(name = "app_drawer_bg_color"),
         parse = ColorOption::fromString,
         save = ColorOption::toString,
-        onSet = { reloadHelper.reloadGrid() },
+        onSet = { reloadHelper.recreate() },
         defaultValue = ColorOption.fromString(context.getString(R.string.config_default_app_drawer_bg_color)),
     )
 

diff --git a/lawnchair/src/app/lawnchair/views/LawnchairScrimView.kt b/lawnchair/src/app/lawnchair/views/LawnchairScrimView.kt
@@ -23,7 +23,8 @@ class LawnchairScrimView(context: Context, attrs: AttributeSet?) : ScrimView(con
     override fun updateSysUiColors() {
         val threshold = STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD
         val forceChange = visibility == VISIBLE &&
-            alpha > threshold && Color.alpha(mBackgroundColor) / (255f * drawerOpacity) > threshold
+            alpha > threshold &&
+            Color.alpha(mBackgroundColor) / (255f * drawerOpacity) > threshold
         with(systemUiController) {
             if (forceChange) {
                 updateUiState(SystemUiController.UI_STATE_SCRIM_VIEW, !isScrimDark)