diff options
author | Xin Li <delphij@google.com> | 2024-01-18 13:56:04 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2024-01-18 13:56:04 -0800 |
commit | 6810c1964607b9e75893c6af2efe82df87625653 (patch) | |
tree | 8acf8209b0a1a7899151b491f5894ad57bb88411 /quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java | |
parent | 507cccdb174d25c7d3b5f802741e50041f6e5929 (diff) | |
parent | b7a5eb9ef418c9dce6f597244d2fb5b9b491610d (diff) | |
download | Launcher3-6810c1964607b9e75893c6af2efe82df87625653.tar.gz |
Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I0708bf3c060ba84089722d0bd9480a4f4bd2b8e2
Change-Id: I31bb7f6aa8f71244f6e44903927f67e9d3a85642
Diffstat (limited to 'quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java')
-rw-r--r-- | quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java index 072fc3026e..f58fd4547d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java @@ -15,6 +15,8 @@ */ package com.android.launcher3.taskbar; +import static com.android.quickstep.views.DesktopTaskView.isDesktopModeSupported; + import android.content.ComponentName; import android.content.pm.ActivityInfo; @@ -28,7 +30,6 @@ import com.android.quickstep.LauncherActivityInterface; import com.android.quickstep.RecentsModel; import com.android.quickstep.util.DesktopTask; import com.android.quickstep.util.GroupTask; -import com.android.quickstep.views.DesktopTaskView; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; @@ -109,7 +110,7 @@ public final class KeyboardQuickSwitchController implements DesktopVisibilityController desktopController = LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); final boolean onDesktop = - DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED + isDesktopModeSupported() && desktopController != null && desktopController.areFreeformTasksVisible(); @@ -136,7 +137,7 @@ public final class KeyboardQuickSwitchController implements // Hide all desktop tasks and show them on the hidden tile int hiddenDesktopTasks = 0; - if (DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) { + if (isDesktopModeSupported()) { DesktopTask desktopTask = findDesktopTask(tasks); if (desktopTask != null) { hiddenDesktopTasks = desktopTask.tasks.size(); |