Refresh most branch specific patches

Fixed up:
LineageOS-16.0/android_packages_apps_Backgrounds/308977.patch
LineageOS-16.0/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch
LineageOS-17.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch
LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch

Must review again:
LineageOS-14.1/android_packages_apps_PackageInstaller/64d8b44.patch

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-10-16 14:05:45 -04:00
parent f7194d1f13
commit 4ce35a3c60
163 changed files with 912 additions and 564 deletions

View file

@ -1,52 +0,0 @@
From 05eea0579312ffc9d0691ae06b6a09165ecd110e Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Tue, 24 Apr 2018 12:13:43 -0400
Subject: [PATCH] Remove logo
Change-Id: Ibf900e6ceb8a571b4770f6df7efeea1d97b6b477
---
screen_ui.cpp | 8 --------
screen_ui.h | 1 -
2 files changed, 9 deletions(-)
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 190aaf33..1908885a 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -506,13 +506,6 @@ void ScreenRecoveryUI::draw_header_locked(int& y) {
}
y += v_unit;
- // Draw logo
- icon = logo_image;
- icon_w = gr_get_width(icon);
- icon_h = gr_get_height(icon);
- icon_x = kMarginWidth + (gr_fb_width() - icon_w) / 2;
- icon_y = y + ((v_unit * 4) - icon_h) / 2;
- gr_blit(icon, 0, 0, icon_w, icon_h, icon_x, icon_y);
y += v_unit * 4;
y += v_unit * 1; // Margin
@@ -811,7 +804,6 @@ bool ScreenRecoveryUI::Init(const std::string& locale) {
text_col_ = text_row_ = 0;
text_top_ = 1;
- LoadBitmap("logo_image", &logo_image);
LoadBitmap("ic_back", &ic_back);
LoadBitmap("ic_back_sel", &ic_back_sel);
diff --git a/screen_ui.h b/screen_ui.h
index be54994a..f6c3713f 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -133,7 +133,6 @@ class ScreenRecoveryUI : public RecoveryUI {
// The layout to use.
int layout_;
- GRSurface* logo_image;
GRSurface* ic_back;
GRSurface* ic_back_sel;
--
2.17.0

View file

@ -1,36 +0,0 @@
From 03e04247e9416a901fbb30b742d985ac6c801598 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 20 Sep 2018 16:43:46 -0400
Subject: [PATCH] Switch to our update server
Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
---
src/org/lineageos/updater/misc/Utils.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 171c2cc..d97a492 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -149,16 +149,10 @@ public class Utils {
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE));
- String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT);
- String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
- if (serverUrl.trim().isEmpty()) {
- serverUrl = context.getString(R.string.updater_server_url);
- }
+ String server = "0OTA_SERVER_CLEARNET0";
- return serverUrl.replace("{device}", device)
- .replace("{type}", type)
- .replace("{incr}", incrementalVersion);
+ return server + "?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
}
public static String getChangelogURL(Context context) {
--
2.19.0