Move dark status bar to launcher activity

lawnchair/src/app/lawnchair/LawnchairLauncher.kt

@@ -45,6 +45,8 @@ import com.android.launcher3.popup.SystemShortcut
 import com.android.launcher3.statemanager.StateManager
 import com.android.launcher3.uioverrides.QuickstepLauncher
 import com.android.launcher3.uioverrides.states.OverviewState
+import com.android.launcher3.util.SystemUiController.UI_STATE_BASE_WINDOW
+import com.android.launcher3.util.Themes
 import com.android.launcher3.widget.RoundedCornerEnforcement
 import com.android.systemui.plugins.shared.LauncherOverlayManager
 import com.android.systemui.shared.system.QuickStepContract
@@ -117,6 +119,10 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner,
         prefs.roundedWidgets.subscribeValues(this) {
             RoundedCornerEnforcement.sRoundedCornerEnabled = it
         }
+        val isWorkspaceDarkText = Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText)
+        prefs.darkStatusBar.subscribeValues(this) { darkStatusBar ->
+            systemUiController.updateUiState(UI_STATE_BASE_WINDOW, isWorkspaceDarkText || darkStatusBar)
+        }
 
         colorScheme = themeProvider.colorScheme
     }

lawnchair/src/app/lawnchair/views/LawnchairScrimView.kt

@@ -12,16 +12,12 @@ import com.android.launcher3.views.ScrimView
 class LawnchairScrimView(context: Context, attrs: AttributeSet?) : ScrimView(context, attrs) {
 
     private var drawerOpacity = 0f
-    private var darkStatusBar = false
 
     init {
         val pm = PreferenceManager.getInstance(context)
         pm.drawerOpacity.subscribeValues(this) {
             drawerOpacity = it
         }
-        pm.darkStatusBar.subscribeValues(this) {
-            darkStatusBar = it
-        }
     }
 
     override fun updateSysUiColors() {
@@ -32,7 +28,7 @@ class LawnchairScrimView(context: Context, attrs: AttributeSet?) : ScrimView(con
             if (forceChange) {
                 updateUiState(SystemUiController.UI_STATE_SCRIM_VIEW, !isScrimDark)
             } else {
-                updateUiState(SystemUiController.UI_STATE_SCRIM_VIEW, darkStatusBar)
+                updateUiState(SystemUiController.UI_STATE_SCRIM_VIEW, 0)
             }
         }
     }