commit 43c46e578746b5848c6bf2531b7986873b79dad5
author Tracy Zhou <tracyzhou@google.com> Tue Nov 21 06:14:08 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 21 06:14:08 2023 +0000
tree b022f4baa9f3c107e2dcd90ffe17012913aa96bd
parent a75fd790eadf3c40c64cfea4235d6dc376526015
parent ab1dc752e8920ac1c10ed9c337ca19f507a1b69f

Merge "Make sure the hotseat icons are always visible in phone mode" into main

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index 267b15c..9a37bcb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -17,6 +17,7 @@
 
 import static com.android.app.animation.Interpolators.EMPHASIZED;
 import static com.android.launcher3.taskbar.TaskbarKeyguardController.MASK_ANY_SYSUI_LOCKED;
+import static com.android.launcher3.taskbar.TaskbarManager.isPhoneMode;
 import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_APP;
 import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_OVERVIEW;
 import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_STASHED_LAUNCHER_STATE;
@@ -725,6 +726,7 @@
         }
         mIconAlphaForHome.setValue(alpha);
         boolean hotseatVisible = alpha == 0
+                || isPhoneMode(mLauncher.getDeviceProfile())
                 || (!mControllers.uiController.isHotseatIconOnTopWhenAligned()
                 && mIconAlignment.value > 0);
         /*