From ad6806e3f06fd8ddcf6f05e3b59aac0d4544a45d Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Sun, 25 Dec 2022 13:59:05 +0100
Subject: [PATCH] fix: taskbar

---
 fix-trebuchet-taskbar.patch | 26 ++++++++++++++++++++++++++
 sync.sh                     |  7 ++++---
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 fix-trebuchet-taskbar.patch

diff --git a/fix-trebuchet-taskbar.patch b/fix-trebuchet-taskbar.patch
new file mode 100644
index 0000000..d046cd8
--- /dev/null
+++ b/fix-trebuchet-taskbar.patch
@@ -0,0 +1,26 @@
+From 62d44fa0a9b5d4a9d379bdbba6270a36433f5920 Mon Sep 17 00:00:00 2001
+From: nyyu <mail@nyyu.dev>
+Date: Fri, 23 Dec 2022 19:20:55 +0100
+Subject: [PATCH] fix: trebuchet taskbar
+
+Change-Id: I566e6a3cf799cdd8ee5d4f07221b9d6bb80d41cb
+---
+ .../src/com/android/launcher3/taskbar/TaskbarManager.java      | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+index e7d102d5c3..ef0f12eae4 100644
+--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
++++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+@@ -133,8 +133,7 @@ public class TaskbarManager {
+                     LineageSettings.System.ENABLE_TASKBAR, 0) == 1;
+             SystemUiProxy.INSTANCE.get(mContext).setTaskbarEnabled(enabled);
+
+-            // Restart launcher
+-            System.exit(0);
++            recreateTaskbar();
+         };
+         // TODO(b/227669780): Consolidate this w/ DisplayController callbacks
+         mComponentCallbacks = new ComponentCallbacks() {
+--
+2.39.0
diff --git a/sync.sh b/sync.sh
index bd31d1c..259a7c7 100644
--- a/sync.sh
+++ b/sync.sh
@@ -45,6 +45,7 @@ git am $CI_WORKSPACE/fix-always-enable-taskbar-toggle.patch || git am --abort
 cd $TOPDIR
 cd packages/apps/Trebuchet
 git am $CI_WORKSPACE/fix-enable-more-grids-for-tablet.patch || git am --abort
+git am $CI_WORKSPACE/fix-trebuchet-taskbar.patch || git am --abort
 cd $TOPDIR
 
 #bluetooth
@@ -56,9 +57,9 @@ git am $CI_WORKSPACE/fix-bt-le.patch || git am --abort
 cd $TOPDIR
 
 #connectivity
-cd packages/modules/Connectivity
-git am $CI_WORKSPACE/fix-NetworkStats-disable-BPF.patch || git am --abort
-cd $TOPDIR
+#cd packages/modules/Connectivity
+#git am $CI_WORKSPACE/fix-NetworkStats-disable-BPF.patch || git am --abort
+#cd $TOPDIR
 
 #av
 cd frameworks/av