From 9dec3c701809b7aa80583193e62be0ca294d10ce Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 12 Jul 2018 22:12:55 -0400 Subject: [PATCH] More overlay work --- .../base/packages/SettingsProvider/res/values/defaults.xml | 3 +++ .../common/packages/apps/CMParts/res/values/config.xml | 7 +++++++ .../packages/apps/LineageParts/res/values/config.xml | 7 +++++++ .../common/packages/apps/Settings/res/values/config.xml | 7 +++++++ Patches/Common/android_vendor_divested/packages.mk | 1 + Scripts/LineageOS-14.1/Defaults.sh | 4 ---- Scripts/LineageOS-14.1/Patch.sh | 1 - Scripts/LineageOS-14.1/Theme.sh | 6 ------ Scripts/LineageOS-15.1/Defaults.sh | 2 -- Scripts/LineageOS-15.1/Patch.sh | 1 - 10 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 Patches/Common/android_vendor_divested/overlay/common/packages/apps/CMParts/res/values/config.xml create mode 100644 Patches/Common/android_vendor_divested/overlay/common/packages/apps/LineageParts/res/values/config.xml create mode 100644 Patches/Common/android_vendor_divested/overlay/common/packages/apps/Settings/res/values/config.xml 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 index db5f5836..b7bd69ce 100644 --- 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 @@ -16,4 +16,7 @@ 50% 50% + + false + android/com.android.internal.backup.LocalTransport diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/CMParts/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/CMParts/res/values/config.xml new file mode 100644 index 00000000..3794214b --- /dev/null +++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/CMParts/res/values/config.xml @@ -0,0 +1,7 @@ + + + + + false + + diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/LineageParts/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/LineageParts/res/values/config.xml new file mode 100644 index 00000000..3794214b --- /dev/null +++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/LineageParts/res/values/config.xml @@ -0,0 +1,7 @@ + + + + + false + + diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Settings/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Settings/res/values/config.xml new file mode 100644 index 00000000..c5860ccc --- /dev/null +++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Settings/res/values/config.xml @@ -0,0 +1,7 @@ + + + + + true + + diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk index 5d1d1de5..2f5ccfed 100644 --- a/Patches/Common/android_vendor_divested/packages.mk +++ b/Patches/Common/android_vendor_divested/packages.mk @@ -18,6 +18,7 @@ PRODUCT_PACKAGES += \ # Replacements PRODUCT_PACKAGES += \ CameraRoll \ + K9Mail \ Silence \ VanillaMusic diff --git a/Scripts/LineageOS-14.1/Defaults.sh b/Scripts/LineageOS-14.1/Defaults.sh index 740c3666..b1b5f518 100644 --- a/Scripts/LineageOS-14.1/Defaults.sh +++ b/Scripts/LineageOS-14.1/Defaults.sh @@ -50,9 +50,5 @@ 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 "vendor/cm"; -awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml; -#sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true/' overlay/common/packages/apps/Settings/res/values/config.xml; - cd "$DOS_BUILD_BASE"; echo "Default settings changed!"; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 38ac38fd..7e8699f9 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -99,7 +99,6 @@ awk -i inplace '!/com.android.internal.R.bool.config_permissionReviewRequired/' enterAndClear "packages/apps/CMParts"; rm -rf src/org/cyanogenmod/cmparts/cmstats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml; #Nuke part of CMStats -sed -i 's|config_showWeatherMenu">true|config_showWeatherMenu">false|' res/values/config.xml; #Disable Weather #TODO OVERLAY patch -p1 < "$DOS_PATCHES/android_packages_apps_CMParts/0001-Remove_Analytics.patch"; #Remove the rest of CMStats patch -p1 < "$DOS_PATCHES/android_packages_apps_CMParts/0002-Reduced_Resolution.patch"; #Allow reducing resolution to save power diff --git a/Scripts/LineageOS-14.1/Theme.sh b/Scripts/LineageOS-14.1/Theme.sh index 6a40886d..581479b9 100644 --- a/Scripts/LineageOS-14.1/Theme.sh +++ b/Scripts/LineageOS-14.1/Theme.sh @@ -32,12 +32,6 @@ sed -i "s/#fff4511e/#ffe53935/" core/res/res/values/colors.xml; enter "packages/apps/CMParts"; sed -i "s/#ff009688/#ff$DOS_THEME_500/" res/values/colors.xml; -if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then -enter "packages/apps/GmsCore"; -sed -i "s/#ff7fcac3/#ff$DOS_THEME_300/" microg-ui-tools/src/main/res/values/colors.xml; -sed -i "s/#ff009688/#ff$DOS_THEME_500/" microg-ui-tools/src/main/res/values/colors.xml; -fi; - enter "packages/apps/Settings"; sed -i "s/#ff009688/#ff$DOS_THEME_500/" res/values/styles.xml; #TODO: Fix: Storage, Profiles diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh index bc0caa19..dce10bce 100644 --- a/Scripts/LineageOS-15.1/Defaults.sh +++ b/Scripts/LineageOS-15.1/Defaults.sh @@ -59,9 +59,7 @@ enter "packages/inputmethods/LatinIME"; #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"; -awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.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_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true/' overlay/common/packages/apps/Settings/res/values/config.xml; cd "$DOS_BUILD_BASE"; echo "Default settings changed!"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index eea765bf..4555ddc2 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -117,7 +117,6 @@ sed -i 's/\"org\.fdroid\.fdroid/\"org.fdroid.fdroid_dos/' app/src/main/java/org/ enterAndClear "packages/apps/LineageParts"; rm -rf src/org/lineageos/lineageparts/lineagestats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml #Nuke part of the analytics -sed -i 's|config_showWeatherMenu">true|config_showWeatherMenu">false|' res/values/config.xml; #Disable Weather #TODO OVERLAY patch -p1 < "$DOS_PATCHES/android_packages_apps_LineageParts/0001-Remove_Analytics.patch"; #Remove analytics rm AndroidManifest.xml.orig res/values/*.xml.orig;