diff --git a/Patches/Common/android_vendor_divested/divested.mk b/Patches/Common/android_vendor_divested/divested.mk
new file mode 100644
index 00000000..ab6d3d3e
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/divested.mk
@@ -0,0 +1,27 @@
+PRODUCT_BRAND ?= DivestOS
+PRODUCT_VERSION_MAJOR = 1
+PRODUCT_VERSION_MINOR = 0
+PRODUCT_VERSION_MAINTENANCE := 0
+
+DEVICE_PACKAGE_OVERLAYS += vendor/divested/overlay/common
+
+PRODUCT_PACKAGES += ModuleBlocker
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ keyguard.no_require_sim=true \
+ ro.config.notification_sound=Pong.ogg \
+ ro.config.alarm_alert=Alarm_Buzzer.ogg \
+ ro.build.selinux=1 \
+ ro.storage_manager.enabled=true \
+ ro.cmlegal.url=https://divestos.xyz/index.php?page=about
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+ BUILD_UTC_DATE=0
+
+ifneq ($(TARGET_BUILD_VARIANT),eng)
+ ADDITIONAL_DEFAULT_PROPERTIES += \
+ ro.adb.secure=1
+endif
+
+PRODUCT_COPY_FILES += \
+ vendor/divested/extras/etc/dns66.json:system/etc/dns66/settings.json
diff --git a/Patches/Common/android_vendor_divested/dns66.json b/Patches/Common/android_vendor_divested/extras/etc/dns66.json
similarity index 100%
rename from Patches/Common/android_vendor_divested/dns66.json
rename to Patches/Common/android_vendor_divested/extras/etc/dns66.json
diff --git a/Patches/LineageOS-14.1/android_vendor_cm/firmware_deblobber.mk b/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.mk
similarity index 92%
rename from Patches/LineageOS-14.1/android_vendor_cm/firmware_deblobber.mk
rename to Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.mk
index 72d56c95..1794c259 100644
--- a/Patches/LineageOS-14.1/android_vendor_cm/firmware_deblobber.mk
+++ b/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.mk
@@ -1,4 +1,4 @@
-FD_PREBUILTS_PATH := vendor/cm/firmware_deblobber
+FD_PREBUILTS_PATH := vendor/divested/firmware_deblobber
FD_INSTALL_OUT := $(PRODUCT_OUT)/firmware_deblobber/
FD_INSTALL_TARGET := $(PRODUCT_OUT)/firmware_deblobber-$(TARGET_ARCH).zip
diff --git a/Patches/Common/android_vendor_divested/module_blocker.mk b/Patches/Common/android_vendor_divested/module_blocker.mk
new file mode 100644
index 00000000..fea1515e
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/module_blocker.mk
@@ -0,0 +1,27 @@
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := ModuleBlocker
+
+LOCAL_OVERRIDES_PACKAGES := \
+ bootanimation.zip \
+ PhotoTable \
+ Terminal \
+ LockClock \
+ WeatherProvider \
+ bash \
+ curl \
+ htop \
+ powertop \
+ strace \
+ vim \
+ wget \
+ scp \
+ sftp \
+ ssh \
+ sshd \
+ sshd_config \
+ ssh-keygen \
+ start-ssh \
+ rsync
+
+include $(BUILD_PREBUILT)
diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 00000000..d979dd3d
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,257 @@
+
+
+
+
+ false
+
+
+ true
+
+
+
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+
+ - SUPL_HOST=supl.google.com
+ - SUPL_PORT=7275
+ - NTP_SERVER=north-america.pool.ntp.org
+ - SUPL_VER=0x20000
+ - SUPL_MODE=1
+
+
+
+ true
+
+
+
+
+
+
+
+
+ false
+
+
+ true
+
+
+ 6
+
+
+ time.android.com
+
+
+ Android-Mms/2.0
+
+
+
+
+
+
+
+
+ TRUNCATE
+
+
+
+
+
+ org.smssecure.smssecure
+
+
+ @null
+
+
+
+
+ - com.android.location.fused
+ - org.microg.nlp
+
+
+
+ @null
+
+
+ @null
+
+
+ @null
+
+
+ com.android.location.fused
+
+
+ true
+
+
+ @null
+
+
+ true
+
+
+ com.android.location.fused
+
+
+ 250
+
+
+ true
+
+
+ true
+
+
+ 300000
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+ 30000
+
+
+ false
+
+
+ false
+
+
+ false
+
+
diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/DocumentsUI/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/DocumentsUI/res/values/config.xml
new file mode 100644
index 00000000..2075f429
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/DocumentsUI/res/values/config.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ true
+
+
diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 00000000..db5f5836
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ false
+
+ 0
+
+ false
+
+
+ false
+
+
+ false
+
+ 50%
+ 50%
+
diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
new file mode 100644
index 00000000..bf4ca916
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ wifi,cell,bt,dnd,flashlight,rotation,battery,profiles,sync,location,airplane,caffeine,saver,hotspot,nfc
+
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+ 1
+
+
diff --git a/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/lineage/res/res/xml/config.xml b/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/lineage/res/res/xml/config.xml
new file mode 100644
index 00000000..b5e60092
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/lineage/res/res/xml/config.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ true
+
+
diff --git a/Patches/Common/android_lineage-sdk/profile_default.xml b/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/lineage/res/res/xml/profile_default.xml
similarity index 100%
rename from Patches/Common/android_lineage-sdk/profile_default.xml
rename to Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/lineage/res/res/xml/profile_default.xml
diff --git a/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
new file mode 100644
index 00000000..e4eea367
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -0,0 +1,11 @@
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
diff --git a/Patches/Common/android_packages_apps_FDroid/default_repos.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/FDroid/app/src/main/res/values/default_repos.xml
similarity index 100%
rename from Patches/Common/android_packages_apps_FDroid/default_repos.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/FDroid/app/src/main/res/values/default_repos.xml
diff --git a/Patches/Common/android_packages_apps_SetupWizard/logo.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/SetupWizard/res/drawable/logo.xml
similarity index 100%
rename from Patches/Common/android_packages_apps_SetupWizard/logo.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/SetupWizard/res/drawable/logo.xml
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/values/preferences_defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/values/preferences_defaults.xml
new file mode 100644
index 00000000..f6bbfb9d
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/values/preferences_defaults.xml
@@ -0,0 +1,10 @@
+
+
+
+ false
+ true
+ true
+ false
+ false
+
+
diff --git a/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_4x4.xml
similarity index 100%
rename from Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_4x4.xml
diff --git a/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x5.xml
similarity index 100%
rename from Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x5.xml
diff --git a/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x6.xml
similarity index 100%
rename from Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x6.xml
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/inputmethods/LatinIME/java/res/values/config-common.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/inputmethods/LatinIME/java/res/values/config-common.xml
new file mode 100644
index 00000000..80da60b7
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/inputmethods/LatinIME/java/res/values/config-common.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ 5
+
+
diff --git a/Patches/Common/android_vendor_divested/overlay/common/vendor/cm/res/res/xml/profile_default.xml b/Patches/Common/android_vendor_divested/overlay/common/vendor/cm/res/res/xml/profile_default.xml
new file mode 100644
index 00000000..078519ba
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/vendor/cm/res/res/xml/profile_default.xml
@@ -0,0 +1,364 @@
+
+
+ 1affb8e9-9f00-4a85-8126-5858d6817069
+
+
+ toggle
+ no
+ 0
+ 0
+ 2
+ 1
+
+ 0
+ true
+
+
+ 154
+ true
+
+
+ normal
+ true
+
+
+ content://settings/system/notification_sound
+ content://settings/system/ringtone
+ DEFAULT
+ DEFAULT
+ DEFAULT
+ DEFAULT
+
+
+ 4
+ 5
+ true
+
+
+ 5
+ 5
+ true
+
+
+ 2
+ 5
+ true
+
+
+ 3
+ 4
+ true
+
+
+ 8
+ 0
+ true
+
+
+ 4
+ 1
+ true
+
+
+ 0
+ 1
+ true
+
+
+ 1
+ 0
+ true
+
+
+ 7
+ 0
+ true
+
+
+ 5
+ 1
+ true
+
+
+ 2
+ 0
+ true
+
+
+ 9
+ 9
+ true
+ 1
+
+
+
+
+ toggle
+ no
+ 0
+ 0
+ 2
+ 1
+
+ 0
+ true
+
+
+ 103
+ true
+
+
+ normal
+ true
+
+
+ content://settings/system/notification_sound
+ content://settings/system/ringtone
+ DEFAULT
+ DEFAULT
+ DEFAULT
+ DEFAULT
+
+
+ 4
+ 5
+ true
+
+
+ 5
+ 5
+ true
+
+
+ 2
+ 5
+ true
+
+
+ 3
+ 4
+ true
+
+
+ 8
+ 0
+ true
+
+
+ 4
+ 0
+ true
+
+
+ 0
+ 1
+ true
+
+
+ 1
+ 1
+ true
+
+
+ 7
+ 0
+ true
+
+
+ 5
+ 1
+ true
+
+
+ 2
+ 0
+ true
+
+
+ 9
+ 9
+ true
+ 1
+
+
+
+
+ toggle
+ no
+ 0
+ 0
+ 2
+ 2
+
+ 0
+ true
+
+
+ 51
+ true
+
+
+ normal
+ true
+
+
+ content://settings/system/notification_sound
+ content://settings/system/ringtone
+ DEFAULT
+ DEFAULT
+ DEFAULT
+ DEFAULT
+
+
+ 4
+ 5
+ true
+
+
+ 5
+ 5
+ true
+
+
+ 3
+ 4
+ true
+
+
+ 2
+ 5
+ true
+
+
+ 8
+ 0
+ true
+
+
+ 4
+ 0
+ true
+
+
+ 1
+ 1
+ true
+
+
+ 0
+ 1
+ true
+
+
+ 7
+ 0
+ true
+
+
+ 5
+ 0
+ true
+
+
+ 2
+ 0
+ true
+
+
+ 9
+ 9
+ true
+ 1
+
+
+
+
+ toggle
+ no
+ 0
+ 0
+ 0
+ 0
+
+ 0
+ true
+
+
+ 128
+ true
+
+
+ normal
+ true
+
+
+ content://settings/system/notification_sound
+ content://settings/system/ringtone
+ DEFAULT
+ DEFAULT
+ DEFAULT
+ DEFAULT
+
+
+ 4
+ 5
+ true
+
+
+ 5
+ 5
+ true
+
+
+ 3
+ 4
+ true
+
+
+ 2
+ 5
+ true
+
+
+ 8
+ 0
+ true
+
+
+ 4
+ 1
+ true
+
+
+ 1
+ 1
+ true
+
+
+ 0
+ 1
+ true
+
+
+ 7
+ 0
+ true
+
+
+ 5
+ 1
+ true
+
+
+ 2
+ 0
+ true
+
+
+ 9
+ 9
+ true
+ 1
+
+
+
diff --git a/Patches/LineageOS-14.1/android_vendor_cm/config.xml b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml
similarity index 89%
rename from Patches/LineageOS-14.1/android_vendor_cm/config.xml
rename to Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml
index 24567e37..f9f9b98b 100644
--- a/Patches/LineageOS-14.1/android_vendor_cm/config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml
@@ -1,20 +1,24 @@
-
+ true
- http://www.apache.org/licenses/LICENSE-2.0
+
+ false
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
diff --git a/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
new file mode 100644
index 00000000..e4eea367
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
@@ -0,0 +1,11 @@
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
diff --git a/Patches/Common/android_vendor_divested/sce-UnifiedNLP-Backends.mk b/Patches/Common/android_vendor_divested/packages-UnifiedNLP_Backends.mk
similarity index 100%
rename from Patches/Common/android_vendor_divested/sce-UnifiedNLP-Backends.mk
rename to Patches/Common/android_vendor_divested/packages-UnifiedNLP_Backends.mk
diff --git a/Patches/Common/android_vendor_divested/sce.mk b/Patches/Common/android_vendor_divested/packages.mk
similarity index 100%
rename from Patches/Common/android_vendor_divested/sce.mk
rename to Patches/Common/android_vendor_divested/packages.mk
diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber.mk b/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber.mk
deleted file mode 100644
index 32350876..00000000
--- a/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-FD_PREBUILTS_PATH := vendor/lineage/firmware_deblobber
-
-FD_INSTALL_OUT := $(PRODUCT_OUT)/firmware_deblobber/
-FD_INSTALL_TARGET := $(PRODUCT_OUT)/firmware_deblobber-$(TARGET_ARCH).zip
-
-$(FD_INSTALL_TARGET): $(ALL_MODULES.updater.BUILT)
- $(hide) rm -rf $@ $(FD_INSTALL_OUT)
- $(hide) mkdir -p $(FD_INSTALL_OUT)/META-INF/com/google/android/
- $(hide) cp $(ALL_MODULES.updater.BUILT) $(FD_INSTALL_OUT)/META-INF/com/google/android/update-binary
- $(hide) cp $(FD_PREBUILTS_PATH)/firmware_deblobber.sh $(FD_INSTALL_OUT)/
- $(hide) cp $(FD_PREBUILTS_PATH)/updater-script $(FD_INSTALL_OUT)/META-INF/com/google/android/updater-script
- $(hide) (cd $(FD_INSTALL_OUT) && zip -qr $@ *)
-
-.PHONY: firmware_deblobber
-firmware_deblobber: $(FD_INSTALL_TARGET)
- @echo "Done: $(FD_INSTALL_TARGET)"
diff --git a/Scripts/LineageOS-14.1/Defaults.sh b/Scripts/LineageOS-14.1/Defaults.sh
index 4580b650..740c3666 100644
--- a/Scripts/LineageOS-14.1/Defaults.sh
+++ b/Scripts/LineageOS-14.1/Defaults.sh
@@ -25,13 +25,6 @@
echo "Changing default settings...";
enter "frameworks/base";
-sed -i '0,/wifi,cell,battery/s/wifi,cell,battery,dnd,flashlight,rotation,bt,airplane/wifi,cell,bt,dnd,flashlight,rotation,battery,profiles,location,airplane,caffeine,saver,hotspot,nfc/' packages/SystemUI/res/values/config.xml; #Default quick tiles
-sed -i 's/def_lock_screen_allow_private_notifications">true/def_lock_screen_allow_private_notifications">false/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_lockscreen_sounds_enabled">1/def_lockscreen_sounds_enabled">0/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_networks_available_notification_on">true/def_networks_available_notification_on">false/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_sound_effects_enabled">true/def_sound_effects_enabled">false/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_window_animation_scale">100%/def_window_animation_scale">50%/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_window_transition_scale">100%/def_window_transition_scale">50%/' packages/SettingsProvider/res/values/defaults.xml;
#sed -i 's/CMPRIVACY_GUARD_NOTIFICATION, 1/CMPRIVACY_GUARD_NOTIFICATION, 0/' services/core/java/com/android/server/am/ActivityStack.java;
#sed -i 's/VOLBTN_MUSIC_CONTROLS, 1/VOLBTN_MUSIC_CONTROLS, 0/' services/core/java/com/android/server/policy/PhoneWindowManager.java; #FIXME
#sed -i 's/VOLUME_KEYS_CONTROL_RING_STREAM, 1/VOLUME_KEYS_CONTROL_RING_STREAM, 0/' services/core/java/com/android/server/audio/AudioService.java; #FIXME
@@ -57,26 +50,9 @@ enter "packages/apps/Settings";
sed -i 's/WEB_ACTION_ENABLED, 1/WEB_ACTION_ENABLED, 0/' src/com/android/settings/applications/ManageDomainUrls.java; #Disable "Instant Apps"
sed -i 's/Float.parseFloat(newValue.toString()) : 1;/Float.parseFloat(newValue.toString()) : 0.5f;/' src/com/android/settings/DevelopmentSettings.java; #Always reset animation scales to 0.5
-enter "packages/apps/Trebuchet";
-sed -i 's|homescreen_search_default">true|homescreen_search_default">false|' res/values/preferences_defaults.xml; #Disable search
-sed -i 's|drawer_compact_default">false|drawer_compact_default">true|' res/values/preferences_defaults.xml; #Enable compact view
-sed -i 's|use_scroller_default">true|use_scroller_default">false|' res/values/preferences_defaults.xml; #Hide scroller
-sed -i 's|drawer_search_default">true|drawer_search_default">false|' res/values/preferences_defaults.xml; #Disable search
-
enter "vendor/cm";
-sed -i 's/ro.config.notification_sound=Argon.ogg/ro.config.notification_sound=Pong.ogg/' config/common.mk;
-sed -i 's/ro.config.alarm_alert=Hassium.ogg/ro.config.alarm_alert=Alarm_Buzzer.ogg/' config/common.mk;
awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's|config_mms_user_agent">LineageOS|config_mms_user_agent">Android-Mms/2.0|' overlay/common/frameworks/base/core/res/res/values/config.xml;
-sed -i 's/config_storage_manager_settings_enabled">true/config_storage_manager_settings_enabled">false/' overlay/common/packages/apps/Settings/res/values/config.xml;
#sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true/' overlay/common/packages/apps/Settings/res/values/config.xml;
-enter "vendor/cmsdk";
-sed -i 's/config_enableAppSuggestOverlay" translatable="false">true/config_enableAppSuggestOverlay" translatable="false">false/' cm/res/res/values/config.xml;
-sed -i 's/proximityCheckOnWakeEnabledByDefault">false/proximityCheckOnWakeEnabledByDefault">true/' cm/res/res/values/config.xml;
-sed -i 's/def_forward_lookup">1/def_forward_lookup">0/' packages/CMSettingsProvider/res/values/defaults.xml;
-sed -i 's/def_people_lookup">1/def_people_lookup">0/' packages/CMSettingsProvider/res/values/defaults.xml;
-sed -i 's/def_reverse_lookup">1/def_reverse_lookup">0/' packages/CMSettingsProvider/res/values/defaults.xml;
-
cd "$DOS_BUILD_BASE";
echo "Default settings changed!";
diff --git a/Scripts/LineageOS-14.1/Optimize.sh b/Scripts/LineageOS-14.1/Optimize.sh
index 4adccf9f..c4126b3d 100644
--- a/Scripts/LineageOS-14.1/Optimize.sh
+++ b/Scripts/LineageOS-14.1/Optimize.sh
@@ -22,16 +22,6 @@ echo "Optimizing...";
enter "frameworks/base";
sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java;
-sed -i 's|config_useVolumeKeySounds">true|config_useVolumeKeySounds">false|' core/res/res/values/config.xml;
-sed -i 's|config_radioScanningTimeout">0|config_radioScanningTimeout">300000|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_fast_bss_transition_enabled">false|config_wifi_fast_bss_transition_enabled">true|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_enable_wifi_firmware_debugging">true|config_wifi_enable_wifi_firmware_debugging">false|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_supplicant_scan_interval">15000|config_wifi_supplicant_scan_interval">30000|' core/res/res/values/config.xml;
-#sed -i 's|config_autoBrightnessLightSensorRate">250|config_autoBrightnessLightSensorRate">1000|' core/res/res/values/config.xml;
-sed -i 's|config_recents_use_hardware_layers">false|config_recents_use_hardware_layers">true|' packages/SystemUI/res/values/config.xml;
-#sed -i 's|config_recents_fake_shadows">false|config_recents_fake_shadows">true|' packages/SystemUI/res/values/config.xml;
-sed -i 's|config_notifications_round_rect_clipping">true|config_notifications_round_rect_clipping">false|' packages/SystemUI/res/values/config.xml;
-sed -i 's|config_showTemperatureWarning">0|config_showTemperatureWarning">1|' packages/SystemUI/res/values/config.xml; #XXX: Doesn't seem to work?
#sed -i 's|||'
enter "kernel"
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 723db6d9..ac726c46 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -213,8 +213,6 @@ sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Ch
if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/CM_BUILDTYPE := dos/CM_BUILDTYPE := dosNC/' config/common.mk; fi;
sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence
#if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> config/sce.mk; fi; #Include DNS66 as an alternative
-if [ "$DOS_HOSTS_BLOCKING" = false ]; then cp "$DOS_PATCHES_COMMON/android_vendor_divested/dns66.json" prebuilt/common/etc/dns66.json; fi;
-if [ "$DOS_HOSTS_BLOCKING" = false ]; then sed -i '4iPRODUCT_COPY_FILES += vendor/cm/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; fi; #Include DNS66 default config
enterAndClear "vendor/cmsdk";
awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather
diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh
index 84ecba0b..bc0caa19 100644
--- a/Scripts/LineageOS-15.1/Defaults.sh
+++ b/Scripts/LineageOS-15.1/Defaults.sh
@@ -25,20 +25,9 @@
echo "Changing default settings...";
enter "lineage-sdk";
-sed -i 's/def_forward_lookup">1/def_forward_lookup">0/' packages/LineageSettingsProvider/res/values/defaults.xml;
-sed -i 's/def_people_lookup">1/def_people_lookup">0/' packages/LineageSettingsProvider/res/values/defaults.xml;
-sed -i 's/def_reverse_lookup">1/def_reverse_lookup">0/' packages/LineageSettingsProvider/res/values/defaults.xml;
-sed -i 's/proximityCheckOnWakeEnabledByDefault">false/proximityCheckOnWakeEnabledByDefault">true/' lineage/res/res/values/config.xml;
#sed -i 's/VOLBTN_MUSIC_CONTROLS, 1/VOLBTN_MUSIC_CONTROLS, 0/' sdk/src/java/org/lineageos/internal/buttons/LineageButtons.java; #FIXME
enter "frameworks/base";
-sed -i '0,/wifi,bt,dnd,flashlight/s/wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast/wifi,cell,bt,dnd,flashlight,rotation,battery,sync,location,airplane,caffeine,saver,hotspot,nfc/' packages/SystemUI/res/values/config.xml; #Default quick tiles
-sed -i 's/def_lock_screen_allow_private_notifications">true/def_lock_screen_allow_private_notifications">false/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_lockscreen_sounds_enabled">1/def_lockscreen_sounds_enabled">0/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_networks_available_notification_on">true/def_networks_available_notification_on">false/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_sound_effects_enabled">true/def_sound_effects_enabled">false/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_window_animation_scale">100%/def_window_animation_scale">50%/' packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's/def_window_transition_scale">100%/def_window_transition_scale">50%/' packages/SettingsProvider/res/values/defaults.xml;
#sed -i 's/PRIVACY_GUARD_NOTIFICATION, 1/PRIVACY_GUARD_NOTIFICATION, 0/' services/core/java/com/android/server/am/ActivityRecord.java;
#sed -i 's/VOLUME_KEYS_CONTROL_RING_STREAM, 1/VOLUME_KEYS_CONTROL_RING_STREAM, 0/' services/core/java/com/android/server/audio/AudioService.java; #FIXME
#sed -i 's/TORCH_LONG_PRESS_POWER_GESTURE, 0/TORCH_LONG_PRESS_POWER_GESTURE, 1/' services/core/java/com/android/server/policy/PhoneWindowManager.java; #FIXME
@@ -67,16 +56,11 @@ enter "packages/apps/Trebuchet";
sed -i 's/"pref_predictive_apps", true/"pref_predictive_apps", false/' src/com/android/launcher3/Launcher.java;
enter "packages/inputmethods/LatinIME";
-sed -i 's/config_personalization_dict_wipe_interval_in_days">-1/config_personalization_dict_wipe_interval_in_days">5/' java/res/values/config-common.xml;
#sed -i 's/PREF_KEY_USE_PERSONALIZED_DICTS, true/PREF_KEY_USE_PERSONALIZED_DICTS, false/' java/src/com/android/inputmethod/latin/settings/SettingsValues.java; #FIXME
enter "vendor/lineage";
-sed -i 's/ro.config.notification_sound=Argon.ogg/ro.config.notification_sound=Pong.ogg/' config/common.mk;
-sed -i 's/ro.config.alarm_alert=Hassium.ogg/ro.config.alarm_alert=Alarm_Buzzer.ogg/' config/common.mk;
awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml;
-sed -i 's|config_mms_user_agent">LineageOS|config_mms_user_agent">Android-Mms/2.0|' overlay/common/frameworks/base/core/res/res/values/config.xml;
sed -i 's/def_stats_collection">true/def_stats_collection">false/' overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml;
-sed -i 's/config_storage_manager_settings_enabled">true/config_storage_manager_settings_enabled">false/' overlay/common/packages/apps/Settings/res/values/config.xml;
#sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true/' overlay/common/packages/apps/Settings/res/values/config.xml;
cd "$DOS_BUILD_BASE";
diff --git a/Scripts/LineageOS-15.1/Optimize.sh b/Scripts/LineageOS-15.1/Optimize.sh
index 965c4a0b..6694cbd1 100644
--- a/Scripts/LineageOS-15.1/Optimize.sh
+++ b/Scripts/LineageOS-15.1/Optimize.sh
@@ -22,16 +22,6 @@ echo "Optimizing...";
enter "frameworks/base";
sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; #TODO: Fix transition scale
-sed -i 's|config_useVolumeKeySounds">true|config_useVolumeKeySounds">false|' core/res/res/values/config.xml;
-sed -i 's|config_radioScanningTimeout">0|config_radioScanningTimeout">300000|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_fast_bss_transition_enabled">false|config_wifi_fast_bss_transition_enabled">true|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_enable_wifi_firmware_debugging">true|config_wifi_enable_wifi_firmware_debugging">false|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_supplicant_scan_interval">15000|config_wifi_supplicant_scan_interval">30000|' core/res/res/values/config.xml;
-#sed -i 's|config_autoBrightnessLightSensorRate">250|config_autoBrightnessLightSensorRate">1000|' core/res/res/values/config.xml;
-sed -i 's|config_recents_use_hardware_layers">false|config_recents_use_hardware_layers">true|' packages/SystemUI/res/values/config.xml;
-#sed -i 's|config_recents_fake_shadows">false|config_recents_fake_shadows">true|' packages/SystemUI/res/values/config.xml;
-sed -i 's|config_notifications_round_rect_clipping">true|config_notifications_round_rect_clipping">false|' packages/SystemUI/res/values/config.xml;
-sed -i 's|config_showTemperatureWarning">0|config_showTemperatureWarning">1|' packages/SystemUI/res/values/config.xml; #XXX: Doesn't seem to work?
#sed -i 's|||'
enter "kernel"
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 802440b0..2ce17dde 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -212,8 +212,6 @@ sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/comm
if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYPE := dos/LINEAGE_BUILDTYPE := dosNC/' config/common.mk; fi;
sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence
#if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> config/sce.mk; fi; #Include DNS66 as an alternative
-if [ "$DOS_HOSTS_BLOCKING" = false ]; then cp "$DOS_PATCHES_COMMON/android_vendor_divested/dns66.json" prebuilt/common/etc/dns66.json; fi;
-if [ "$DOS_HOSTS_BLOCKING" = false ]; then sed -i '4iPRODUCT_COPY_FILES += vendor/lineage/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; fi; #Include DNS66 default config
#
#END OF ROM CHANGES
#