From b5f07ae7d78f37d13ca0d32537355f68b9f30618 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sat, 17 Mar 2018 17:09:51 -0400
Subject: [PATCH] 15.1: Fixes and cleanup

---
 PrebuiltApps                        |  2 +-
 Scripts/LineageOS-15.1/Functions.sh |  5 +--
 Scripts/LineageOS-15.1/Theme.sh     | 66 -----------------------------
 3 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 Scripts/LineageOS-15.1/Theme.sh

diff --git a/PrebuiltApps b/PrebuiltApps
index c2424434..d5afaad2 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit c2424434c72e628e661cbdd91a37a8c5e092bd8e
+Subproject commit d5afaad25c6fdd4f06d679fba7b7c955b2a5cf73
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 98f57ee5..632e8d3c 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -82,7 +82,6 @@ patchWorkspace() {
 	source $scripts/Overclock.sh;
 	source $scripts/Optimize.sh;
 	source $scripts/Rebrand.sh;
-	source $scripts/Theme.sh;
 	source $scripts/Deblob.sh;
 	source $scripts/Patch_CVE.sh;
 	source build/envsetup.sh;
@@ -95,7 +94,7 @@ enableDexPreOpt() {
 		if [ -f BoardConfig.mk ]; then
 			echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
 			echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk;
-			echo "WITH_DEXPREOPT_BOOT_IMG_ONLY := true" >> BoardConfig.mk;
+			echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk;
 			echo "Enabled dexpreopt for $1";
 		fi;
 	fi;
@@ -106,7 +105,7 @@ export -f enableDexPreOpt;
 enableDexPreOptFull() {
 	cd $base$1;
 	if [ -f BoardConfig.mk ]; then
-		sed -i "s/WITH_DEXPREOPT_BOOT_IMG_ONLY := true/WITH_DEXPREOPT_BOOT_IMG_ONLY := false/" BoardConfig.mk;
+		sed -i "s/WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true/WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false/" BoardConfig.mk;
 		echo "Enabled full dexpreopt";
 	fi;
 	cd $base;
diff --git a/Scripts/LineageOS-15.1/Theme.sh b/Scripts/LineageOS-15.1/Theme.sh
deleted file mode 100644
index 6ef259b7..00000000
--- a/Scripts/LineageOS-15.1/Theme.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Spot Communications, Inc.
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-#Replaces teal accents with orange/yellow ones
-
-echo "Applying theme..."
-
-export themeOverride50="FFCA28" #Amber 400
-export themeOverride100="FFC107" #Amber 500
-export themeOverride200="FFA726" #Orange 400
-export themeOverride300="FF9800" #Orange 500
-export themeOverride500="FF5722" #Deep Orange 500
-export themeOverride700="E64A19" #Deep Orange 700
-
-#export themeOverride50="26C6DA" #Cyan 400
-#export themeOverride100="00BCD4" #Cyan 500
-#export themeOverride200="29B6F6" #Light Blue 400
-#export themeOverride300="03A9F4" #Light Blue 500
-#export themeOverride500="2196F3" #Blue 500
-#export themeOverride700="1976D2" #Blue 700
-
-enter "frameworks/base"
-sed -i "s/#ffe0f2f1/#ff$themeOverride50/" core/res/res/values/colors_material.xml
-sed -i "s/#ffb2dfdb/#ff$themeOverride100/" core/res/res/values/colors_material.xml
-sed -i "s/#ff80cbc4/#ff$themeOverride200/" core/res/res/values/colors_material.xml
-sed -i "s/#ff4db6ac/#ff$themeOverride300/" core/res/res/values/colors_material.xml
-sed -i "s/#ff009688/#ff$themeOverride500/" core/res/res/values/colors_material.xml
-sed -i "s/#ff00796b/#ff$themeOverride700/" core/res/res/values/colors_material.xml
-sed -i "s/#fff4511e/#ffe53935/" core/res/res/values/colors.xml
-
-enter "packages/apps/GmsCore"
-sed -i "s/#ff7fcac3/#ff$themeOverride300/" microg-ui-tools/src/main/res/values/colors.xml
-sed -i "s/#ff009688/#ff$themeOverride500/" microg-ui-tools/src/main/res/values/colors.xml
-
-enter "packages/apps/Settings"
-sed -i "s/#ff009688/#ff$themeOverride500/" res/values/styles.xml
-#TODO: Fix: Storage, Profiles
-
-enter "packages/apps/Updater"
-sed -i "s/#ff009688/#ff$themeOverride500/" res/values/colors.xml
-
-enter "packages/inputmethods/LatinIME"
-sed -i "s/#80CBC4/#$themeOverride200/" java/res/values/colors.xml
-sed -i "s/#4DB6AC/#$themeOverride300/" java/res/values/colors.xml
-mogrify -format png -fill "#$themeOverride100" -opaque "#b2dfdb" -fuzz 10% java/res/drawable*/*lxx*.png
-mogrify -format png -fill "#$themeOverride200" -opaque "#80cbc4" -fuzz 10% java/res/drawable*/*lxx*.png
-mogrify -format png -fill "#$themeOverride300" -opaque "#4db6ac" -fuzz 10% java/res/drawable*/*lxx*.png
-mogrify -format png -fill "#$themeOverride300" -opaque "#7fcac3" -fuzz 10% java/res/drawable*/*lxx*.png
-mogrify -format png -fill "#$themeOverride400" -opaque "#26a69a" -fuzz 10% java/res/drawable*/*lxx*.png
-
-cd $base
-echo "Applied theme!"