SetupWizard: Remove Lineage logo until we can replace it

This commit is contained in:
Tad 2018-03-28 01:15:59 -04:00
parent e634a22758
commit 8a9cd5c57c
4 changed files with 129 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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/";

View File

@ -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