PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Call setOverviewDragState() whenever taskbar is recreated"

Browse Source 
This reverts commit 0adca26744.

Reason for revert: potential cause of presubmit failures

Change-Id: I102d92f86afc7fa21c806d3cf1642e343dc91d45
This commit is contained in:
Sukesh Ram
2024-03-21 21:25:30 +00:00
committed by Android (Google) Code Review
parent 0adca26744
commit 541c5d272d
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+8 -18
View File
@@ -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.
*