From 96a0608f1911d112811e0080a706fa3cf70761e6 Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Sun, 18 Sep 2022 12:17:53 +0200
Subject: [PATCH] patches

---
 fix-always-enable-taskbar-toggle.patch | 26 +++++++++++
 fix-enable-more-grids-for-tablet.patch | 62 ++++++++++++++++++++++++++
 sync.sh                                | 17 ++++++-
 3 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 fix-always-enable-taskbar-toggle.patch
 create mode 100644 fix-enable-more-grids-for-tablet.patch

diff --git a/fix-always-enable-taskbar-toggle.patch b/fix-always-enable-taskbar-toggle.patch
new file mode 100644
index 0000000..1c95356
--- /dev/null
+++ b/fix-always-enable-taskbar-toggle.patch
@@ -0,0 +1,26 @@
+From 1696a9a340caf464cfa01b60b07185b963a9cd7a Mon Sep 17 00:00:00 2001
+From: nyyu <mail@nyyu.dev>
+Date: Sun, 18 Sep 2022 11:44:26 +0200
+Subject: [PATCH] fix: always enable taskbar toggle
+
+Change-Id: I247db667bec92fabcdbe7bd84946e79bae7e0bb6
+---
+ src/org/lineageos/lineageparts/input/ButtonSettings.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java
+index a6fa54f..bf622ee 100644
+--- a/src/org/lineageos/lineageparts/input/ButtonSettings.java
++++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java
+@@ -476,7 +476,7 @@ public class ButtonSettings extends SettingsPreferenceFragment
+         mEnableTaskbar = findPreference(KEY_ENABLE_TASKBAR);
+         if (mEnableTaskbar != null) {
+             if (!isTablet(getContext()) || !hasNavigationBar()) {
+-                mNavigationPreferencesCat.removePreference(mEnableTaskbar);
++                //mNavigationPreferencesCat.removePreference(mEnableTaskbar);
+             } else {
+                 mEnableTaskbar.setOnPreferenceChangeListener(this);
+                 mEnableTaskbar.setChecked(LineageSettings.System.getInt(resolver,
+-- 
+2.37.3
+
diff --git a/fix-enable-more-grids-for-tablet.patch b/fix-enable-more-grids-for-tablet.patch
new file mode 100644
index 0000000..901e02f
--- /dev/null
+++ b/fix-enable-more-grids-for-tablet.patch
@@ -0,0 +1,62 @@
+From 788abc7df2e2ff32537a244ceca30c8fb910649d Mon Sep 17 00:00:00 2001
+From: nyyu <mail@nyyu.dev>
+Date: Sun, 18 Sep 2022 17:34:29 +0200
+Subject: [PATCH] fix: enable more grids for tablet
+
+Change-Id: I7f9450057f682ec6b42a2c2a358cbeef660939cc
+---
+ res/xml/device_profiles.xml | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml
+index cc33cd439a..2f6a7fd623 100644
+--- a/res/xml/device_profiles.xml
++++ b/res/xml/device_profiles.xml
+@@ -94,7 +94,7 @@
+         launcher:numHotseatIcons="4"
+         launcher:dbFile="launcher_4_by_5.db"
+         launcher:defaultLayoutId="@xml/default_workspace_4x5"
+-        launcher:deviceCategory="phone|multi_display" >
++        launcher:deviceCategory="phone|tablet|multi_display" >
+ 
+         <display-option
+             launcher:name="Short Stubby"
+@@ -147,7 +147,7 @@
+         launcher:numHotseatIcons="5"
+         launcher:dbFile="launcher.db"
+         launcher:defaultLayoutId="@xml/default_workspace_5x5"
+-        launcher:deviceCategory="phone|multi_display" >
++        launcher:deviceCategory="phone|tablet|multi_display" >
+ 
+         <display-option
+             launcher:name="Large Phone"
+@@ -184,7 +184,7 @@
+         launcher:numHotseatIcons="5"
+         launcher:dbFile="launcher_5_by_6.db"
+         launcher:defaultLayoutId="@xml/default_workspace_5x6"
+-        launcher:deviceCategory="phone|multi_display" >
++        launcher:deviceCategory="phone|tablet|multi_display" >
+ 
+         <display-option
+             launcher:name="Large Phone"
+@@ -205,7 +205,7 @@
+         launcher:numHotseatIcons="5"
+         launcher:dbFile="launcher_5_by_7.db"
+         launcher:defaultLayoutId="@xml/default_workspace_5x7"
+-        launcher:deviceCategory="phone|multi_display" >
++        launcher:deviceCategory="phone|tablet|multi_display" >
+ 
+         <display-option
+             launcher:name="Large Phone"
+@@ -254,7 +254,7 @@
+         launcher:numHotseatIcons="6"
+         launcher:dbFile="launcher_6_by_6.db"
+         launcher:defaultLayoutId="@xml/default_workspace_6x6"
+-        launcher:deviceCategory="phone|multi_display" >
++        launcher:deviceCategory="phone|tablet|multi_display" >
+ 
+         <display-option
+             launcher:name="Large Phone"
+-- 
+2.37.3
+
diff --git a/sync.sh b/sync.sh
index 9865e96..723f5bc 100644
--- a/sync.sh
+++ b/sync.sh
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/bash -e
+
+. build/envsetup.sh
 
 TOPDIR=$(pwd)
 changelog=${TOPDIR}/changelog-${device}-${version}.md
@@ -12,6 +14,19 @@ done
 
 repo sync -q -c -j 6 --fail-fast --force-sync --no-tags
 
+cd packages/apps/LineageParts
+git am $DRONE_WORKSPACE_BASE/fix-always-enable-taskbar-toggle.patch || git am --abort
+cd $TOPDIR
+cd packages/apps/Trebuchet
+git am $DRONE_WORKSPACE_BASE/fix-enable-more-grids-for-tablet.patch || git am --abort
+cd $TOPDIR
+repopick -t twelve-colors -i -r
+cd frameworks/base
+git reset --hard losul/lineage-19.1
+cd $TOPDIR
+repopick -P frameworks/base -r 336824 336825 336826 336827 336828 336829 336830 336831 336832 336833 336834 336835 336836
+cd $TOPDIR
+
 echo -e "# Build $(date '+%Y-%m-%d %H:%M:%S') UTC\n" >>"${changelog}"
 
 tmp=($(repo forall -c 'echo "${REPO_PATH}:$(git rev-parse --short HEAD)"'))