diff --git a/Patches/LineageOS-15.1/android_bootable_recovery/0001-Remove_Logo.patch b/Patches/LineageOS-15.1/android_bootable_recovery/0001-Remove_Logo.patch new file mode 100644 index 00000000..3550b323 --- /dev/null +++ b/Patches/LineageOS-15.1/android_bootable_recovery/0001-Remove_Logo.patch @@ -0,0 +1,52 @@ +From 05eea0579312ffc9d0691ae06b6a09165ecd110e Mon Sep 17 00:00:00 2001 +From: Tad +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 + diff --git a/Patches/Linux b/Patches/Linux index 1007ddcf..170452f5 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 1007ddcf81da7615d14aeb23e87b85ddd8181358 +Subproject commit 170452f54a67b44d2186d13950cc4c58d92f9869 diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 33d21d24..d621ab05 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -20,9 +20,10 @@ echo "Rebranding..."; enter "bootable/recovery"; +patch -p1 < $patches"android_bootable_recovery/0001-Remove_Logo.patch"; #Remove logo rendering code +rm res*/images/logo_image.png; #Remove logo images sed -i 's|Android Recovery|DivestOS Recovery|' *_ui.cpp; sed -i 's|LineageOS|DivestOS|' ui.cpp; -#TODO: Change out res-*/images/logo_image.png enter "build/make"; sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo.sh; #Override build user