From dc1222bbcb30928d1fcbe0967f093f0a9877bdd7 Mon Sep 17 00:00:00 2001
From: oxmc <oxmc@noreply.localhost>
Date: Mon, 18 Aug 2025 18:35:33 -0700
Subject: [PATCH] Update pawlet_rpi4.mk

---
 pawlet_rpi4.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index 86785cf..dc8a218 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -16,7 +16,7 @@ PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
 
-# Remove all stock launcher variants
+# Remove all stock launcher variants and unwanted packages
 PRODUCT_PACKAGES -= \
     Launcher3 \
     Launcher3QuickStep \
@@ -32,11 +32,16 @@ PRODUCT_PACKAGES -= \
     VisualizationWallpapers \
     PhotoTable
 
+# Disable AOSP's SystemUI and WMShell to use Lawnchair's versions
+PRODUCT_PACKAGES -= \
+    SystemUI \
+    WindowManager-Shell
+
 # Add Lawnchair package
 PRODUCT_PACKAGES += \
     Lawnchair
 
-# Declare Lawnchair's Soong namespace (if using custom build)
+# Declare Lawnchair's Soong namespace
 PRODUCT_SOONG_NAMESPACES += \
     packages/apps/Lawnchair
 
@@ -45,7 +50,7 @@ PRODUCT_SOONG_OVERRIDES += \
     Lawnchair:Launcher3 \
     Lawnchair:Launcher3QuickStep
 
-# Device-specific overlays (keep your existing FrameworkRes overlay)
+# Device-specific overlays
 PRODUCT_PACKAGES += \
     FrameworkResDevOxmcOverlay