Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-06-29 08:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

15.1: More fixes and cleanup

Browse Source
This commit is contained in:
Tad 2018-04-03 10:56:28 -04:00
parent 42da60142c
commit fa2987d3dc
7 changed files with 196 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Patches/LineageOS-14.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch
View File

@ -1,67 +0,0 @@
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

60
Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0002-Remove_Logo.patch
View File

@ -1,60 +0,0 @@
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

64
Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
<!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
<!-- Phone, Silence, [All Apps], Fennec DOS, Camera -->
<resolve
launcher:container="-101"
launcher:screen="0"
launcher:x="0"
launcher:y="0" >
<favorite
launcher:packageName="com.android.dialer"
launcher:className="com.android.dialer.DialtactsActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="1"
launcher:x="1"
launcher:y="0" >
<favorite
launcher:packageName="org.smssecure.smssecure"
launcher:className="org.smssecure.smssecure.ConversationListActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="3"
launcher:x="2"
launcher:y="0" >
<favorite
launcher:packageName="us.spotco.fennec_dos"
launcher:className="org.mozilla.gecko.LauncherActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="4"
launcher:x="4"
launcher:y="0" >
<favorite
launcher:packageName="org.cyanogenmod.snap"
launcher:className="com.android.camera.CameraLauncher" />
<favorite
launcher:packageName="com.android.camera2"
launcher:className="com.android.camera.CameraLauncher" />
</resolve>
</favorites>

64
Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
<!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
<!-- Phone, Silence, [All Apps], Fennec DOS, Camera -->
<resolve
launcher:container="-101"
launcher:screen="0"
launcher:x="0"
launcher:y="0" >
<favorite
launcher:packageName="com.android.dialer"
launcher:className="com.android.dialer.DialtactsActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="1"
launcher:x="1"
launcher:y="0" >
<favorite
launcher:packageName="org.smssecure.smssecure"
launcher:className="org.smssecure.smssecure.ConversationListActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="3"
launcher:x="2"
launcher:y="0" >
<favorite
launcher:packageName="us.spotco.fennec_dos"
launcher:className="org.mozilla.gecko.LauncherActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="4"
launcher:x="4"
launcher:y="0" >
<favorite
launcher:packageName="org.cyanogenmod.snap"
launcher:className="com.android.camera.CameraLauncher" />
<favorite
launcher:packageName="com.android.camera2"
launcher:className="com.android.camera.CameraLauncher" />
</resolve>
</favorites>

64
Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
<!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
<!-- Phone, Silence, [All Apps], Fennec DOS, Camera -->
<resolve
launcher:container="-101"
launcher:screen="1"
launcher:x="1"
launcher:y="0" >
<favorite
launcher:packageName="com.android.dialer"
launcher:className="com.android.dialer.DialtactsActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="2"
launcher:x="2"
launcher:y="0" >
<favorite
launcher:packageName="org.smssecure.smssecure"
launcher:className="org.smssecure.smssecure.ConversationListActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="4"
launcher:x="4"
launcher:y="0" >
<favorite
launcher:packageName="us.spotco.fennec_dos"
launcher:className="org.mozilla.gecko.LauncherActivity" />
</resolve>
<resolve
launcher:container="-101"
launcher:screen="5"
launcher:x="5"
launcher:y="0" >
<favorite
launcher:packageName="org.cyanogenmod.snap"
launcher:className="com.android.camera.CameraLauncher" />
<favorite
launcher:packageName="com.android.camera2"
launcher:className="com.android.camera.CameraLauncher" />
</resolve>
</favorites>

1
Scripts/LineageOS-14.1/Patch.sh
View File

@ -135,7 +135,6 @@ 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/";

5
Scripts/LineageOS-15.1/Patch.sh
View File

@ -133,12 +133,15 @@ patch -p1 < $patches"android_packages_apps_Settings/0002-Remove_Analytics.patch"
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/Trebuchet"
cp -r $patches"android_packages_apps_Trebuchet/default_workspace/." "res/xml/";
enterAndClear "packages/apps/Updater"
patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server
enterAndClear "packages/apps/WallpaperPicker"
#TODO: Add back wallpapers
sed -i 's/req.touchEnabled = touchEnabled;/req.touchEnabled = true;/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; #Allow scrolling
sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled(true);/' src/com/android/wallpaperpicker/WallpaperCropActivity.java;
sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0.5f);/' src/com/android/wallpaperpicker/WallpaperPickerActivity.java; #Center aligned by default