From 541c5d272dbae72e604f109d231e2a8817f35a93 Mon Sep 17 00:00:00 2001
From: Sukesh Ram <sukeshram@google.com>
Date: Thu, 21 Mar 2024 21:25:30 +0000
Subject: [PATCH] Revert "Call setOverviewDragState() whenever taskbar is
 recreated"

This reverts commit 0adca26744fe6f5666c7b29e3a48a336a332484e.

Reason for revert: potential cause of presubmit failures

Change-Id: I102d92f86afc7fa21c806d3cf1642e343dc91d45
---
 .../TaskbarLauncherStateController.java       | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index 8d481543c8..a14e3fd784 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -205,7 +205,13 @@ public class TaskbarLauncherStateController {
                     mLauncherState = finalState;
                     updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, false);
                     applyState();
-                    updateOverviewDragState(finalState);
+                    boolean disallowLongClick =
+                            FeatureFlags.enableSplitContextually()
+                                    ? mLauncher.isSplitSelectionActive()
+                                    : finalState == LauncherState.OVERVIEW_SPLIT_SELECT;
+                    com.android.launcher3.taskbar.Utilities.setOverviewDragState(
+                            mControllers, finalState.disallowTaskbarGlobalDrag(),
+                            disallowLongClick, finalState.allowTaskbarInitialSplitSelection());
                 }
             };
 
@@ -250,7 +256,6 @@ public class TaskbarLauncherStateController {
 
         mCanSyncViews = true;
         mLauncher.addOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener);
-        updateOverviewDragState(mLauncherState);
     }
 
     public void onDestroy() {
@@ -323,7 +328,7 @@ public class TaskbarLauncherStateController {
         updateStateForSysuiFlags(systemUiStateFlags, /* applyState */ true);
     }
 
-    private void updateStateForSysuiFlags(int systemUiStateFlags, boolean applyState) {
+    private  void updateStateForSysuiFlags(int systemUiStateFlags, boolean applyState) {
         final boolean prevIsAwake = hasAnyFlag(FLAG_AWAKE);
         final boolean currIsAwake = hasAnyFlag(systemUiStateFlags, SYSUI_STATE_AWAKE);
 
@@ -352,21 +357,6 @@ public class TaskbarLauncherStateController {
         }
     }
 
-    /**
-     * Updates overview drag state on various controllers based on {@link #mLauncherState}.
-     *
-     * @param launcherState The current state launcher is in
-     */
-    private void updateOverviewDragState(LauncherState launcherState) {
-        boolean disallowLongClick =
-                FeatureFlags.enableSplitContextually()
-                        ? mLauncher.isSplitSelectionActive()
-                        : launcherState == LauncherState.OVERVIEW_SPLIT_SELECT;
-        com.android.launcher3.taskbar.Utilities.setOverviewDragState(
-                mControllers, launcherState.disallowTaskbarGlobalDrag(),
-                disallowLongClick, launcherState.allowTaskbarInitialSplitSelection());
-    }
-
     /**
      * Updates the proper flag to change the state of the task bar.
      *