diff --git a/patches/personal/platform_packages_apps_Trebuchet/0001-Revert-Add-support-for-toggling-taskbar.patch b/patches/personal/platform_packages_apps_Trebuchet/0001-Revert-Add-support-for-toggling-taskbar.patch deleted file mode 100644 index 2b49c438..00000000 --- a/patches/personal/platform_packages_apps_Trebuchet/0001-Revert-Add-support-for-toggling-taskbar.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 8048cee6ad85dfe3cc5dcd30005ffbeff4d9c0b4 Mon Sep 17 00:00:00 2001 -From: Alberto Ponces -Date: Tue, 26 Mar 2024 16:32:07 +0000 -Subject: [PATCH] Revert "Add support for toggling taskbar" - -This reverts commit 5a0709789f1665a9f3b3c843865c90d5dda53c7f. ---- - Android.bp | 1 - - .../launcher3/taskbar/TaskbarManager.java | 23 ++----------------- - .../com/android/quickstep/SystemUiProxy.java | 12 ---------- - src/com/android/launcher3/DeviceProfile.java | 6 +---- - 4 files changed, 3 insertions(+), 39 deletions(-) - -diff --git a/Android.bp b/Android.bp -index 8c1298c52b..d987f16bea 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -213,7 +213,6 @@ android_library { - "com_android_wm_shell_flags_lib", - "android.appwidget.flags-aconfig-java", - "com.android.window.flags.window-aconfig-java", -- "org.lineageos.platform" - ], - sdk_version: "current", - min_sdk_version: min_launcher3_sdk_version, -diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java -index d7baf50cda..ecbc7e7fdc 100644 ---- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java -+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java -@@ -77,8 +77,6 @@ import com.android.systemui.shared.system.QuickStepContract; - import com.android.systemui.unfold.UnfoldTransitionProgressProvider; - import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; - --import lineageos.providers.LineageSettings; -- - import java.io.PrintWriter; - import java.util.StringJoiner; - -@@ -111,9 +109,6 @@ public class TaskbarManager { - private static final Uri NAV_BAR_KIDS_MODE = Settings.Secure.getUriFor( - Settings.Secure.NAV_BAR_KIDS_MODE); - -- private static final Uri ENABLE_TASKBAR_URI = LineageSettings.System.getUriFor( -- LineageSettings.System.ENABLE_TASKBAR); -- - private final Context mContext; - private final @Nullable Context mNavigationBarPanelContext; - private final DeviceStateManager mDeviceStateManager; -@@ -157,7 +152,6 @@ public class TaskbarManager { - } - } - private final SettingsCache.OnChangeListener mOnSettingsChangeListener = c -> recreateTaskbar(); -- private final SettingsCache.OnChangeListener mEnableTaskBarListener; - - private boolean mUserUnlocked = false; - -@@ -330,18 +324,6 @@ public class TaskbarManager { - .register(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener); - SettingsCache.INSTANCE.get(mContext) - .register(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener); -- mEnableTaskBarListener = c -> { -- // Create the illusion of this taking effect immediately -- // Also needed because TaskbarManager inits before SystemUiProxy on start -- boolean enabled = LineageSettings.System.getInt(mContext.getContentResolver(), -- LineageSettings.System.ENABLE_TASKBAR, 0) == 1; -- SystemUiProxy.INSTANCE.get(mContext).setTaskbarEnabled(enabled); -- -- // Restart launcher -- System.exit(0); -- }; -- SettingsCache.INSTANCE.get(mContext) -- .register(ENABLE_TASKBAR_URI, mEnableTaskBarListener); - Log.d(TASKBAR_NOT_DESTROYED_TAG, "registering component callbacks from constructor."); - mContext.registerComponentCallbacks(mComponentCallbacks); - mShutdownReceiver.register(mContext, Intent.ACTION_SHUTDOWN); -@@ -500,10 +482,9 @@ public class TaskbarManager { - + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null) - + " FLAG_HIDE_NAVBAR_WINDOW=" + ENABLE_TASKBAR_NAVBAR_UNIFICATION - + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent)); -- SystemUiProxy sysui = SystemUiProxy.INSTANCE.get(mContext); -- sysui.setTaskbarEnabled(isTaskbarEnabled); - if (!isTaskbarEnabled) { -- sysui.notifyTaskbarStatus(/* visible */ false, /* stashed */ false); -+ SystemUiProxy.INSTANCE.get(mContext) -+ .notifyTaskbarStatus(/* visible */ false, /* stashed */ false); - return; - } - -diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java -index 24db2edc78..72f67fc544 100644 ---- a/quickstep/src/com/android/quickstep/SystemUiProxy.java -+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java -@@ -498,18 +498,6 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle { - } - } - -- @Override -- public void setTaskbarEnabled(boolean enabled) { -- if (mSystemUiProxy != null) { -- try { -- mSystemUiProxy.setTaskbarEnabled(enabled); -- } catch (RemoteException e) { -- Log.w(TAG, "Failed call setTaskbarEnabled with arg: " + -- enabled, e); -- } -- } -- } -- - @Override - public void notifyTaskbarStatus(boolean visible, boolean stashed) { - if (mSystemUiProxy != null) { -diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java -index b666ac1883..f96d59ebba 100644 ---- a/src/com/android/launcher3/DeviceProfile.java -+++ b/src/com/android/launcher3/DeviceProfile.java -@@ -70,8 +70,6 @@ import com.android.launcher3.util.IconSizeSteps; - import com.android.launcher3.util.ResourceHelper; - import com.android.launcher3.util.WindowBounds; - --import lineageos.providers.LineageSettings; -- - import java.io.PrintWriter; - import java.util.Locale; - import java.util.function.Consumer; -@@ -350,9 +348,7 @@ public class DeviceProfile { - isTablet = info.isTablet(windowBounds); - isPhone = !isTablet; - isTwoPanels = isTablet && isMultiDisplay; -- boolean isTaskBarEnabled = LineageSettings.System.getInt(context.getContentResolver(), -- LineageSettings.System.ENABLE_TASKBAR, isTablet ? 1 : 0) == 1; -- isTaskbarPresent = isTaskBarEnabled && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS; -+ isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS; - - // Some more constants. - context = getContext(context, info, isVerticalBarLayout() || (isTablet && isLandscape) --- -2.34.1 -