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

Updates layout when overflow button and alt-tab are both triggered.

Browse Source 
Before this cl, the KQS view is closed and reopened when the
overflow button and alt-tab key are triggered one after the other.
This cl changes the behavior so that instead of reopening, the
list of task is updated and the KQS container layout is toggled
between "wrap content" and "match parent".

Bug: 368119679
Test: open KQS via taskbar and observe the layout change
Flag: com.android.launcher3.taskbar_overflow
Change-Id: I05ea4c66727daa206ff1d7906500dc8f9cc81982
This commit is contained in:
Wen-Chien Wang
2024-11-05 00:52:22 +00:00
parent 2e8707dffb
commit ca95004403
4 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java
+46 -17
View File
@@ -139,18 +139,42 @@ public final class KeyboardQuickSwitchController implements
@NonNull Set<Integer> taskIdsToExclude,
boolean wasOpenedFromTaskbar) {
if (mQuickSwitchViewController != null) {
if (!mQuickSwitchViewController.isCloseAnimationRunning()
&& mQuickSwitchViewController.wasOpenedFromTaskbar() == wasOpenedFromTaskbar) {
return;
}
if (!mQuickSwitchViewController.isCloseAnimationRunning()) {
if (mQuickSwitchViewController.wasOpenedFromTaskbar() == wasOpenedFromTaskbar) {
return;
}
// Allow the KQS to be reopened during the close animation to make it more responsive.
// Similarly, if KQS was opened in different mode (from taskbar vs. keyboard event),
// close it so it can be reopened in the correct mode.
// TODO(b/368119679) Consider updating list of shown tasks in place, or at least reopen
// the view in the same vertical location.
closeQuickSwitchView(false);
// Relayout the KQS view instead of recreating a new one if it is the current
// trigger surface is different than the previous one.
final int currentFocusIndexOverride =
currentFocusedIndex == -1 && !mControllerCallbacks.isFirstTaskRunning()
? 0 : currentFocusedIndex;
// Skip the task reload if the list is not changed.
if (!mModel.isTaskListValid(mTaskListChangeId) || !taskIdsToExclude.equals(
mExcludedTaskIds)) {
mExcludedTaskIds = taskIdsToExclude;
mTaskListChangeId = mModel.getTasks((tasks) -> {
processLoadedTasks(tasks, taskIdsToExclude);
mQuickSwitchViewController.updateQuickSwitchView(
mTasks,
mNumHiddenTasks,
currentFocusIndexOverride,
mHasDesktopTask,
mWasDesktopTaskFilteredOut);
});
}
mQuickSwitchViewController.updateLayoutForSurface(wasOpenedFromTaskbar,
currentFocusIndexOverride);
return;
} else {
// Allow the KQS to be reopened during the close animation to make it more
// responsive.
closeQuickSwitchView(false);
}
}
mOverlayContext = mControllers.taskbarOverlayController.requestWindow();
if (Flags.taskbarOverflow()) {
mOverlayContext.getDragLayer().addTouchController(this);
@@ -186,13 +210,7 @@ public final class KeyboardQuickSwitchController implements
mExcludedTaskIds = taskIdsToExclude;
mTaskListChangeId = mModel.getTasks((tasks) -> {
mHasDesktopTask = false;
mWasDesktopTaskFilteredOut = false;
if (onDesktop) {
processLoadedTasksOnDesktop(tasks, taskIdsToExclude);
} else {
processLoadedTasks(tasks, taskIdsToExclude);
}
processLoadedTasks(tasks, taskIdsToExclude);
// Check if the first task is running after the recents model has updated so that we use
// the correct index.
mQuickSwitchViewController.openQuickSwitchView(
@@ -213,6 +231,17 @@ public final class KeyboardQuickSwitchController implements
}
private void processLoadedTasks(List<GroupTask> tasks, Set<Integer> taskIdsToExclude) {
mHasDesktopTask = false;
mWasDesktopTaskFilteredOut = false;
if (mControllers.taskbarDesktopModeController.getAreDesktopTasksVisible()) {
processLoadedTasksOnDesktop(tasks, taskIdsToExclude);
} else {
processLoadedTasksOutsideDesktop(tasks, taskIdsToExclude);
}
}
private void processLoadedTasksOutsideDesktop(List<GroupTask> tasks,
Set<Integer> taskIdsToExclude) {
// Only store MAX_TASK tasks, from most to least recent
Collections.reverse(tasks);
mTasks = tasks.stream()