From 8a9cd5c57ca96f2cf98202904d1cb3c5c3c07bfc Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 28 Mar 2018 01:15:59 -0400
Subject: [PATCH] SetupWizard: Remove Lineage logo until we can replace it

---
 .../0002-Remove_Logo.patch                    | 67 +++++++++++++++++++
 .../0002-Remove_Logo.patch                    | 60 +++++++++++++++++
 Scripts/LineageOS-14.1/Patch.sh               |  1 +
 Scripts/LineageOS-15.1/Patch.sh               |  1 +
 4 files changed, 129 insertions(+)
 create mode 100644 Patches/LineageOS-14.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch
 create mode 100644 Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch

diff --git a/Patches/LineageOS-14.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch b/Patches/LineageOS-14.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch
new file mode 100644
index 00000000..13b006b5
--- /dev/null
+++ b/Patches/LineageOS-14.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch
@@ -0,0 +1,67 @@
+From 049461e47bc551e19486a29e675e4da86551a29d Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Wed, 28 Mar 2018 01:12:50 -0400
+Subject: [PATCH] Remove logo, until we can replace it
+
+Change-Id: Id392a232b77120137438e150b2cec4b4094035cd
+---
+ res/layout/finish_activity.xml  | 14 +-------------
+ res/layout/welcome_activity.xml | 12 ------------
+ 2 files changed, 1 insertion(+), 25 deletions(-)
+
+diff --git a/res/layout/finish_activity.xml b/res/layout/finish_activity.xml
+index 75472da..5d9ecd1 100644
+--- a/res/layout/finish_activity.xml
++++ b/res/layout/finish_activity.xml
+@@ -32,18 +32,6 @@
+         android:orientation="vertical"
+         android:background="@color/primary">
+ 
+-        <ImageView
+-            android:id="@+id/brand_logo"
+-            android:layout_width="match_parent"
+-            android:layout_height="0px"
+-            android:layout_weight="1"
+-            android:src="@drawable/logo"
+-            android:adjustViewBounds="true"
+-            android:scaleType="fitCenter"
+-            android:gravity="center"
+-            android:padding="@dimen/content_margin_left"/>
+-
+-
+         <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+                   android:id="@+id/navigation_bar"
+                   style="@style/setup_wizard_navbar_style" />
+@@ -56,4 +44,4 @@
+                android:background="@drawable/reveal"
+                android:visibility="invisible"/>
+ 
+-</com.cyanogenmod.setupwizard.widget.ScrimInsetsFrameLayout>
+\ No newline at end of file
++</com.cyanogenmod.setupwizard.widget.ScrimInsetsFrameLayout>
+diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml
+index 8495023..d277f87 100644
+--- a/res/layout/welcome_activity.xml
++++ b/res/layout/welcome_activity.xml
+@@ -24,18 +24,6 @@
+     android:orientation="vertical"
+     android:background="@color/primary">
+ 
+-    <ImageView
+-        android:id="@+id/brand_logo"
+-        android:layout_width="match_parent"
+-        android:layout_height="0px"
+-        android:layout_weight="1"
+-        android:src="@drawable/logo"
+-        android:adjustViewBounds="true"
+-        android:scaleType="fitCenter"
+-        android:gravity="center"
+-        android:padding="@dimen/content_margin_left"/>
+-
+-
+     <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+         android:id="@+id/navigation_bar"
+         style="@style/setup_wizard_navbar_style" />
+-- 
+2.16.3
+
diff --git a/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch b/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch
new file mode 100644
index 00000000..e5754a8c
--- /dev/null
+++ b/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch
@@ -0,0 +1,60 @@
+From e0a5af7041878bd5a80d6be1eb8eccd570a19431 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Wed, 28 Mar 2018 01:14:59 -0400
+Subject: [PATCH] Remove logo, until we can replace it
+
+Change-Id: Ib5da1db39eef0b3ed9a43f499a67ffa14affb87a
+---
+ res/layout/finish_activity.xml  | 12 ------------
+ res/layout/welcome_activity.xml | 12 ------------
+ 2 files changed, 24 deletions(-)
+
+diff --git a/res/layout/finish_activity.xml b/res/layout/finish_activity.xml
+index ffa9968..5949e5b 100644
+--- a/res/layout/finish_activity.xml
++++ b/res/layout/finish_activity.xml
+@@ -31,18 +31,6 @@
+         android:orientation="vertical"
+         android:background="@color/primary">
+ 
+-        <ImageView
+-            android:id="@+id/brand_logo"
+-            android:layout_width="match_parent"
+-            android:layout_height="0px"
+-            android:layout_weight="1"
+-            android:src="@drawable/logo"
+-            android:adjustViewBounds="true"
+-            android:scaleType="fitCenter"
+-            android:gravity="center"
+-            android:padding="@dimen/content_margin_left"/>
+-
+-
+         <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+                   android:id="@+id/navigation_bar"
+                   style="@style/setup_wizard_navbar_style" />
+diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml
+index 8495023..d277f87 100644
+--- a/res/layout/welcome_activity.xml
++++ b/res/layout/welcome_activity.xml
+@@ -24,18 +24,6 @@
+     android:orientation="vertical"
+     android:background="@color/primary">
+ 
+-    <ImageView
+-        android:id="@+id/brand_logo"
+-        android:layout_width="match_parent"
+-        android:layout_height="0px"
+-        android:layout_weight="1"
+-        android:src="@drawable/logo"
+-        android:adjustViewBounds="true"
+-        android:scaleType="fitCenter"
+-        android:gravity="center"
+-        android:padding="@dimen/content_margin_left"/>
+-
+-
+     <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+         android:id="@+id/navigation_bar"
+         style="@style/setup_wizard_navbar_style" />
+-- 
+2.16.3
+
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index e9ffa5fa..a3a467f3 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -134,6 +134,7 @@ sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.
 
 enterAndClear "packages/apps/SetupWizard"
 patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.patch" #Remove the rest of CMStats
+patch -p1 < $patches"android_packages_apps_SetupWizard/0002-Remove_Logo.patch" #Remove Lineage logo until we can replace it
 
 enterAndClear "packages/apps/Trebuchet"
 cp -r $patches"android_packages_apps_Trebuchet/default_workspace/." "res/xml/";
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 3863d3f3..36536bca 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -131,6 +131,7 @@ sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.
 
 enterAndClear "packages/apps/SetupWizard"
 patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.patch" #Remove analytics
+patch -p1 < $patches"android_packages_apps_SetupWizard/0002-Remove_Logo.patch" #Remove Lineage logo until we can replace it
 
 enterAndClear "packages/apps/Updater"
 patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server