Update pawlet_rpi4.mk

pawlet_rpi4.mk

@@ -8,10 +8,10 @@
 # Inherit from base Raspberry Pi 4 product
 $(call inherit-product, device/brcm/rpi4/aosp_rpi4.mk)
 
-# Include package removal file (if still needed)
+# Include package removal file
 $(call inherit-product, device/pawlet/rpi/remove_packages.mk)
 
-# Display configurations
+# Device Product Configuration
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
@@ -28,24 +28,11 @@ PRODUCT_PACKAGES -= \
     VisualizationWallpapers \
     PhotoTable
 
-# Disable AOSP's SystemUI and WMShell to use Lawnchair's versions
-PRODUCT_PACKAGES -= \
-    SystemUI \
-    WindowManager-Shell
-
-# Add Lawnchair package
+# Add lawnchair
+$(call inherit-product-if-exists, vendor/lawnchair/lawnchair.mk)
 PRODUCT_PACKAGES += \
     Lawnchair
 
-# Declare Lawnchair's Soong namespace
-PRODUCT_SOONG_NAMESPACES += \
-    packages/apps/Lawnchair
-
-# Force Lawnchair to override stock launchers
-PRODUCT_SOONG_OVERRIDES += \
-    Lawnchair:Launcher3 \
-    Lawnchair:Launcher3QuickStep
-
 # Device-specific overlays
 PRODUCT_PACKAGES += \
     FrameworkResDevOxmcOverlay