aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Focus the first task in KQS when it is not currently running

Browse Source 
Flag: LEGACY ENABLE_KEYBOARD_QUICK_SWITCH ENABLED
Fixes: 316004088
Test: TaplTestsKeyboardQuickSwitch
Change-Id: I8a91ca0dd32c6fc2352d285934a2c4f79ba1bb13
This commit is contained in:
Schneider Victor-tulias
2023-12-18 12:51:47 -05:00
parent 83d42f71ca
commit 4044669a90
3 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
View File

@@ -117,9 +117,12 @@ public class KeyboardQuickSwitchViewController {
* index will be focused.
*/
protected int launchFocusedTask() {
// Launch the second-most recent task if the user quick switches too quickly, if possible.
return launchTaskAt(mCurrentFocusIndex == -1
? (mControllerCallbacks.getTaskCount() > 1 ? 1 : 0) : mCurrentFocusIndex);
if (mCurrentFocusIndex != -1) {
return launchTaskAt(mCurrentFocusIndex);
}
// If the user quick switches too quickly, updateCurrentFocusIndex might not have run.
return launchTaskAt(mControllerCallbacks.isFirstTaskRunning()
&& mControllerCallbacks.getTaskCount() > 1 ? 1 : 0);
}
private int launchTaskAt(int index) {
@@ -134,10 +137,7 @@ public class KeyboardQuickSwitchViewController {
if (task == null) {
return Math.max(0, index);
}
Task task2 = task.task2;
int runningTaskId = ActivityManagerWrapper.getInstance().getRunningTask().taskId;
if (runningTaskId == task.task1.key.id
|| (task2 != null && runningTaskId == task2.key.id)) {
if (mControllerCallbacks.isTaskRunning(task)) {
// Ignore attempts to run the selected task if it is already running.
return -1;
}
@@ -146,7 +146,7 @@ public class KeyboardQuickSwitchViewController {
UI_HELPER_EXECUTOR.execute(() ->
SystemUiProxy.INSTANCE.get(mKeyboardQuickSwitchView.getContext())
.showDesktopApp(task.task1.key.id));
} else if (task2 == null) {
} else if (task.task2 == null) {
UI_HELPER_EXECUTOR.execute(() ->
ActivityManagerWrapper.getInstance().startActivityFromRecents(
task.task1.key,