From cb06a7b35783f38e38862843ad59edb68a5b55d6 Mon Sep 17 00:00:00 2001
From: Andrzej Perczak <linux@andrzejperczak.com>
Date: Wed, 15 Jun 2022 11:35:45 +0200
Subject: [PATCH] config: Cleanup and update common props from Pixel

 * Remove nonexistent or obsolete props.

 * Import new props extracted from raven.

Signed-off-by: Andrzej Perczak <linux@andrzejperczak.com>
---
 config/common.mk  |  4 ----
 config/crdroid.mk | 32 +++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index bcbaff08..90cb3865 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -184,10 +184,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     rsync
 
-# Storage manager
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.storage_manager.enabled=true
-
 # These packages are excluded from user builds
 PRODUCT_PACKAGES_DEBUG += \
     procmem
diff --git a/config/crdroid.mk b/config/crdroid.mk
index de99a6f8..abe6fa23 100644
--- a/config/crdroid.mk
+++ b/config/crdroid.mk
@@ -1,22 +1,28 @@
 # Additional props
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    dalvik.vm.debug.alloc=0 \
-    ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
-    ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
     ro.error.receiver.system.apps=com.google.android.gms \
-    ro.setupwizard.enterprise_mode=1 \
     ro.atrace.core.services=com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent \
-    ro.setupwizard.rotation_locked=true \
     ro.com.google.ime.theme_id=5 \
-    ro.opa.eligible_device=true \
-    ro.com.android.wifi-watchlist=GoogleGuest \
-    ro.setupwizard.network_required=false \
-    ro.setupwizard.gservices_delay=-1 \
-    ro.setupwizard.mode=OPTIONAL \
-    setupwizard.feature.predeferred_enabled=false \
     drm.service.enabled=true \
-    persist.sys.dun.override=0 \
-    persist.sys.disable_rescue=true
+    media.mediadrmservice.enable=true \
+    persist.sys.disable_rescue=true \
+    ro.opa.eligible_device=true
+
+# Setupwizard
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    ro.setupwizard.enterprise_mode=1 \
+    ro.setupwizard.esim_cid_ignore=00000001 \
+    ro.setupwizard.rotation_locked=true \
+    setupwizard.feature.baseline_setupwizard_enabled=true \
+    setupwizard.feature.day_night_mode_enabled=true \
+    setupwizard.feature.lifecycle_refactoring=true \
+    setupwizard.feature.notification_refactoring=true \
+    setupwizard.feature.portal_notification=true \
+    setupwizard.feature.show_pai_screen_in_main_flow.carrier1839=false \
+    setupwizard.feature.show_pixel_tos=true \
+    setupwizard.feature.show_support_link_in_deferred_setup=false \
+    setupwizard.feature.skip_button_use_mobile_data.carrier1839=true \
+    setupwizard.theme=glif_v3_light
 
 # Disable iorapd
 PRODUCT_SYSTEM_PROPERTIES += \