commit 41bff8dedd9905165685c3621818be0b8bb1657e
author Mateusz Cicheński <mateuszc@google.com> Fri Apr 29 18:27:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 29 18:27:45 2022 +0000
tree cc98e322b29518b800f9fcd09ad8393affab386d
parent 2854fe9c49a42bc3c42ae01382f09197c6fb1179
parent cc3cc0428e601ca49ba078bb976b59197b03016b

Merge "Make Hotseat report shelf height on large screen devices." into tm-dev am: f312acc081 am: cc3cc0428e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17969666

Change-Id: I0ddee24a2ffc755ce72804b828becaa106623b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f32b315..7c52e80 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -220,8 +220,7 @@
                     (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0;
             boolean visible = (state == NORMAL || state == OVERVIEW)
                     && (willUserBeActive || isUserActive())
-                    && !profile.isVerticalBarLayout()
-                    && profile.isPhone && !profile.isLandscape;
+                    && !profile.isVerticalBarLayout();
             UiThreadHelper.runAsyncCommand(this, SET_SHELF_HEIGHT, visible ? 1 : 0,
                     profile.hotseatBarSizePx);
         }