Small fixes

Patches/LineageOS-16.0/android_packages_apps_Dialer/0001-Not_Private_Banner.patch

@@ -1,4 +1,4 @@
-From e0da4d4fe702d86e49fcb04e3bcd2de177231012 Mon Sep 17 00:00:00 2001
+From 600951935f6c2f9a7343c01efdff827546126157 Mon Sep 17 00:00:00 2001
 From: Torsten Grote <t@grobox.de>
 Date: Thu, 18 Jun 2020 13:15:16 -0300
 Subject: [PATCH] Show privacy warning on in-call screen
@@ -13,15 +13,33 @@ Date:   Tue Jul 28 02:23:37 2020 +0530
 
 Change-Id: Ic9b18c110481df7042ca1daa36182e0999fe948f
 ---
+ .../res/drawable/ic_baseline_warning.xml      |  9 +++++
  .../res/layout/fragment_incoming_call.xml     |  7 +++-
  .../commontheme/res/values/colors.xml         |  2 +
  .../contactgrid/res/layout/incall_header.xml  | 39 +++++++++++++++++++
  .../impl/res/layout/frag_incall_voice.xml     |  7 ++++
  .../android/incallui/res/values/strings.xml   |  3 ++
  .../android/incallui/res/values/styles.xml    |  4 +-
- 6 files changed, 59 insertions(+), 3 deletions(-)
+ 7 files changed, 68 insertions(+), 3 deletions(-)
+ create mode 100644 java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
  create mode 100644 java/com/android/incallui/contactgrid/res/layout/incall_header.xml
 
+diff --git a/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
+new file mode 100644
+index 000000000..c2baa9bdb
+--- /dev/null
++++ b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="utf-8"?>
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++        android:height="16dp"
++        android:width="16dp"
++        android:viewportWidth="24"
++        android:viewportHeight="24">
++  <path android:fillColor="?attr/colorControlNormal"
++        android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"/>
++</vector>
+\ No newline at end of file
 diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
 index b17fc7358..f46f2b23d 100644
 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml

Patches/LineageOS-17.1/android_packages_apps_Dialer/0001-Not_Private_Banner.patch

@@ -1,4 +1,4 @@
-From b26025c1b6a826e3c7873bd6d3b142391cb9ab8b Mon Sep 17 00:00:00 2001
+From 021d2fd06279964e6d4afd88505308902d91fd1c Mon Sep 17 00:00:00 2001
 From: Torsten Grote <t@grobox.de>
 Date: Thu, 18 Jun 2020 13:15:16 -0300
 Subject: [PATCH] Show privacy warning on in-call screen
@@ -13,17 +13,35 @@ Date:   Tue Jul 28 02:23:37 2020 +0530
 
 Change-Id: Ic9b18c110481df7042ca1daa36182e0999fe948f
 ---
- .../dialer/theme/common/res/values/colors.xml |  3 +-
+ .../res/drawable/ic_baseline_warning.xml      |  9 +++++
+ .../dialer/theme/common/res/values/colors.xml |  1 +
  .../res/layout/fragment_incoming_call.xml     |  7 +++-
  .../contactgrid/res/layout/incall_header.xml  | 39 +++++++++++++++++++
  .../impl/res/layout/frag_incall_voice.xml     |  7 ++++
  .../android/incallui/res/values/strings.xml   |  3 ++
  .../incallui/theme/res/values/styles.xml      |  4 +-
- 6 files changed, 59 insertions(+), 4 deletions(-)
+ 7 files changed, 67 insertions(+), 3 deletions(-)
+ create mode 100644 java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
  create mode 100644 java/com/android/incallui/contactgrid/res/layout/incall_header.xml
 
+diff --git a/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
+new file mode 100644
+index 000000000..c2baa9bdb
+--- /dev/null
++++ b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="utf-8"?>
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++        android:height="16dp"
++        android:width="16dp"
++        android:viewportWidth="24"
++        android:viewportHeight="24">
++  <path android:fillColor="?attr/colorControlNormal"
++        android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"/>
++</vector>
+\ No newline at end of file
 diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml
-index 1831862b1..58316d0de 100644
+index 1831862b1..6f6795cea 100644
 --- a/java/com/android/dialer/theme/common/res/values/colors.xml
 +++ b/java/com/android/dialer/theme/common/res/values/colors.xml
 @@ -21,6 +21,7 @@
@@ -65,6 +83,7 @@ index 1672bf984..63de75999 100644
            android:layout_marginEnd="24dp"/>
 diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_header.xml b/java/com/android/incallui/contactgrid/res/layout/incall_header.xml
 new file mode 100644
+index 000000000..7e8e90e5d
 --- /dev/null
 +++ b/java/com/android/incallui/contactgrid/res/layout/incall_header.xml
 @@ -0,0 +1,39 @@
@@ -108,6 +127,7 @@ new file mode 100644
 +
 +</LinearLayout>
 diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
+index 9cc599dc7..fac420908 100644
 --- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
 +++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
 @@ -29,11 +29,18 @@
@@ -130,6 +150,7 @@ diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.
          android:orientation="vertical">
  
 diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
+index c18ee495e..a5d08d3ec 100644
 --- a/java/com/android/incallui/res/values/strings.xml
 +++ b/java/com/android/incallui/res/values/strings.xml
 @@ -212,4 +212,7 @@
@@ -141,6 +162,7 @@ diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android
 +
  </resources>
 diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
+index 5b65cc3d9..19e7fdc4f 100644
 --- a/java/com/android/incallui/theme/res/values/styles.xml
 +++ b/java/com/android/incallui/theme/res/values/styles.xml
 @@ -21,7 +21,7 @@

Patches/LineageOS-18.1/android_packages_apps_Dialer/0001-Not_Private_Banner.patch

@@ -1,4 +1,4 @@
-From b26025c1b6a826e3c7873bd6d3b142391cb9ab8b Mon Sep 17 00:00:00 2001
+From 841e5a5b885ea58062935ca602fc5e303f79fbc3 Mon Sep 17 00:00:00 2001
 From: Torsten Grote <t@grobox.de>
 Date: Thu, 18 Jun 2020 13:15:16 -0300
 Subject: [PATCH] Show privacy warning on in-call screen
@@ -13,17 +13,35 @@ Date:   Tue Jul 28 02:23:37 2020 +0530
 
 Change-Id: Ic9b18c110481df7042ca1daa36182e0999fe948f
 ---
- .../dialer/theme/common/res/values/colors.xml |  3 +-
+ .../res/drawable/ic_baseline_warning.xml      |  9 +++++
+ .../dialer/theme/common/res/values/colors.xml |  1 +
  .../res/layout/fragment_incoming_call.xml     |  7 +++-
  .../contactgrid/res/layout/incall_header.xml  | 39 +++++++++++++++++++
  .../impl/res/layout/frag_incall_voice.xml     |  7 ++++
  .../android/incallui/res/values/strings.xml   |  3 ++
  .../incallui/theme/res/values/styles.xml      |  4 +-
- 6 files changed, 59 insertions(+), 4 deletions(-)
+ 7 files changed, 67 insertions(+), 3 deletions(-)
+ create mode 100644 java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
  create mode 100644 java/com/android/incallui/contactgrid/res/layout/incall_header.xml
 
+diff --git a/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
+new file mode 100644
+index 000000000..c2baa9bdb
+--- /dev/null
++++ b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="utf-8"?>
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++        android:height="16dp"
++        android:width="16dp"
++        android:viewportWidth="24"
++        android:viewportHeight="24">
++  <path android:fillColor="?attr/colorControlNormal"
++        android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"/>
++</vector>
+\ No newline at end of file
 diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml
-index 1831862b1..58316d0de 100644
+index 1831862b1..6f6795cea 100644
 --- a/java/com/android/dialer/theme/common/res/values/colors.xml
 +++ b/java/com/android/dialer/theme/common/res/values/colors.xml
 @@ -21,6 +21,7 @@
@@ -65,6 +83,7 @@ index 1672bf984..63de75999 100644
            android:layout_marginEnd="24dp"/>
 diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_header.xml b/java/com/android/incallui/contactgrid/res/layout/incall_header.xml
 new file mode 100644
+index 000000000..7e8e90e5d
 --- /dev/null
 +++ b/java/com/android/incallui/contactgrid/res/layout/incall_header.xml
 @@ -0,0 +1,39 @@
@@ -108,6 +127,7 @@ new file mode 100644
 +
 +</LinearLayout>
 diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
+index 9cc599dc7..fac420908 100644
 --- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
 +++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
 @@ -29,11 +29,18 @@
@@ -130,6 +150,7 @@ diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.
          android:orientation="vertical">
  
 diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
+index c18ee495e..a5d08d3ec 100644
 --- a/java/com/android/incallui/res/values/strings.xml
 +++ b/java/com/android/incallui/res/values/strings.xml
 @@ -212,4 +212,7 @@
@@ -141,6 +162,7 @@ diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android
 +
  </resources>
 diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
+index 5b65cc3d9..19e7fdc4f 100644
 --- a/java/com/android/incallui/theme/res/values/styles.xml
 +++ b/java/com/android/incallui/theme/res/values/styles.xml
 @@ -21,7 +21,7 @@

Scripts/LineageOS-16.0/Functions.sh

@@ -105,7 +105,7 @@ export -f enableDexPreOpt;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi; #TODO: handle lineage_device.mk
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";

Scripts/LineageOS-16.0/Patch.sh

@@ -161,8 +161,8 @@ patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Backgrounds/308977.patch"
 enterAndClear "packages/apps/Contacts";
 patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links (GrapheneOS)
 
-#enterAndClear "packages/apps/Dialer";
+enterAndClear "packages/apps/Dialer";
-#patch -p1 < "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS)
+patch -p1 < "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS)
 
 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

Scripts/LineageOS-17.1/Functions.sh

@@ -127,7 +127,7 @@ export -f enableDexPreOpt;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi; #TODO: handle lineage_device.mk
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";

Scripts/LineageOS-17.1/Patch.sh

@@ -156,8 +156,8 @@ enterAndClear "packages/apps/Contacts";
 patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links (GrapheneOS)
 patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Backup.patch"; #Backups are not sent to Google (GrapheneOS)
 
-#enterAndClear "packages/apps/Dialer";
+enterAndClear "packages/apps/Dialer";
-#patch -p1 < "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS)
+patch -p1 < "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS)
 
 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

Scripts/LineageOS-18.1/Functions.sh

@@ -107,8 +107,7 @@ patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
 	#source build/envsetup.sh;
-	repopick -i 312861; #recorder intent improvement
+	#repopick -i 312861; #recorder intent improvement
-	#repopick -i 312866; #mata speaker mic fix
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
@@ -145,7 +144,7 @@ export -f enableDexPreOpt;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi; #TODO: handle lineage_device.mk
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";

Scripts/LineageOS-18.1/Patch.sh

@@ -136,8 +136,8 @@ enterAndClear "packages/apps/Contacts";
 patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links (GrapheneOS)
 patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Backup.patch"; #Backups are not sent to Google (GrapheneOS)
 
-#enterAndClear "packages/apps/Dialer";
+enterAndClear "packages/apps/Dialer";
-#patch -p1 < "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS)
+patch -p1 < "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS)
 
 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
@@ -232,7 +232,7 @@ enterAndClear "device/asus/flox";
 compressRamdisks;
 
 enterAndClear "device/essential/mata";
-git revert --no-edit 3928b30a97fe7f6b6020bbd9d83a56a32de4ba16 e91f0fece65d32ca407be532e2c4456056b1a968; #Unbreak the earpiece speaker, breaking the loud speaker volume control on calls
+git revert --no-edit 1f1d061c4d7ddedcac503608e8fa333aff30a693 3928b30a97fe7f6b6020bbd9d83a56a32de4ba16 e91f0fece65d32ca407be532e2c4456056b1a968; #Unbreak the earpiece speaker, breaking the loud speaker volume control on calls
 
 enterAndClear "device/fxtec/pro1";
 enableVerity; #Resurrect dm-verity
@@ -322,6 +322,10 @@ cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
 
+#Tweaks for <2GB RAM devices
+#enableLowRam "device/samsung/serrano3gxx";
+#enableLowRam "device/samsung/serranoltexx";
+
 #Fix broken options enabled by hardenDefconfig()
 sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/msm/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
 sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/lge/mako/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile