diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0025-Monet_Toggle.patch b/Patches/LineageOS-19.1/android_frameworks_base/0025-Monet_Toggle.patch index 114fdc63..e1fe944a 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0025-Monet_Toggle.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0025-Monet_Toggle.patch @@ -5,11 +5,11 @@ Subject: [PATCH] make monet based theming user configurable --- core/java/android/provider/Settings.java | 21 +++++ - .../theme/ThemeOverlayController.java | 78 +++++++++++-------- - 2 files changed, 66 insertions(+), 33 deletions(-) + .../theme/ThemeOverlayController.java | 76 +++++++++++-------- + 2 files changed, 65 insertions(+), 32 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 1c5650b540f0..c1a6f740f780 100644 +index d7cc36ff4ae2..72e6362c0a96 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6341,6 +6341,27 @@ public final class Settings { @@ -41,15 +41,9 @@ index 1c5650b540f0..c1a6f740f780 100644 * Control whether to enable adaptive sleep mode. * @hide diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java -index 482a70defb3f..7967c645a7b5 100644 +index 482a70defb3f..02c1ab5f82f6 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java -@@ -1,4 +1,4 @@ --/* -+f/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); @@ -111,7 +111,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { private final SecureSettings mSecureSettings; private final Executor mMainExecutor; diff --git a/Patches/LineageOS-19.1/android_hardware_qcom_audio/0001-Unused-sm8150.patch b/Patches/LineageOS-19.1/android_hardware_qcom_audio/0001-Unused-sm8150.patch index 8013825d..5df810be 100644 --- a/Patches/LineageOS-19.1/android_hardware_qcom_audio/0001-Unused-sm8150.patch +++ b/Patches/LineageOS-19.1/android_hardware_qcom_audio/0001-Unused-sm8150.patch @@ -21,7 +21,7 @@ Change-Id: I694c683c9bfde60343f0f6ea8d806bc5e24437e6 2 files changed, 6 insertions(+) diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h -index 85502ad91..95890ab12 100755 +index f2038d8e5..9f8a25ca0 100644 --- a/hal/audio_extn/audio_extn.h +++ b/hal/audio_extn/audio_extn.h @@ -860,7 +860,11 @@ bool audio_extn_utils_is_dolby_format(audio_format_t format); @@ -37,10 +37,10 @@ index 85502ad91..95890ab12 100755 int audio_extn_utils_get_vendor_enhanced_info(); int audio_extn_utils_get_app_sample_rate_for_device(struct audio_device *adev, diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c -index 756faf544..0e25d3a39 100755 +index 9a4a848b6..00fefa351 100644 --- a/hal/audio_extn/utils.c +++ b/hal/audio_extn/utils.c -@@ -3272,6 +3272,7 @@ int audio_extn_utils_get_channels_from_string(const char *id_string) +@@ -3302,6 +3302,7 @@ int audio_extn_utils_get_channels_from_string(const char *id_string) return -EINVAL; } @@ -48,7 +48,7 @@ index 756faf544..0e25d3a39 100755 void audio_extn_utils_release_snd_device(snd_device_t snd_device) { audio_extn_dev_arbi_release(snd_device); -@@ -3280,6 +3281,7 @@ void audio_extn_utils_release_snd_device(snd_device_t snd_device) +@@ -3310,6 +3311,7 @@ void audio_extn_utils_release_snd_device(snd_device_t snd_device) audio_extn_listen_update_device_status(snd_device, LISTEN_EVENT_SND_DEVICE_FREE); } diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch index ab551d53..950dc199 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch @@ -81,7 +81,7 @@ index 12e29e693b..b6745806b5 100644 android:id="@+id/private_dns_mode_opportunistic" layout="@layout/preference_widget_dialog_radiobutton"/> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml -index 9b3dc03134..fff2ae2be4 100644 +index 643aea9acb..dd1e7be283 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -74,6 +74,21 @@ diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 5ade4c93..3314aeb2 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -288,7 +288,6 @@ if enterAndClear "packages/apps/ThemePicker"; then applyPatch "$DOS_PATCHES/android_packages_apps_ThemePicker/0001-Monet_Toggle.patch"; #Add a UI for enabling Material You (GrapheneOS) fi; - if enterAndClear "packages/apps/Trebuchet"; then cp $DOS_BUILD_BASE/vendor/divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_*.xml res/xml/; #XXX: Likely no longer needed fi;