From e50d7a2f541022622ac213cc793d18243404ed35 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 15 May 2020 15:59:34 -0700 Subject: [PATCH] Don't set shelf height if we are in landscape. Bug: 147155783 Test: Start PIP, Rotate launcher, stop getting height offset update Change-Id: Ifc6c11882293228ffd19ac534ee59b1cf29d9a96 --- .../com/android/launcher3/uioverrides/QuickstepLauncher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index ed831ab03a..8f6bedb7cd 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -67,7 +67,6 @@ import com.android.launcher3.util.IntArray; import com.android.launcher3.util.TouchController; import com.android.launcher3.util.UiThreadHelper; import com.android.launcher3.util.UiThreadHelper.AsyncCommand; -import com.android.quickstep.RecentsModel; import com.android.quickstep.SysUINavigationMode; import com.android.quickstep.SysUINavigationMode.Mode; import com.android.quickstep.SystemUiProxy; @@ -169,7 +168,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { boolean willUserBeActive = (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0; boolean visible = (state == NORMAL || state == OVERVIEW) && (willUserBeActive || isUserActive()) - && !profile.isVerticalBarLayout(); + && !profile.isVerticalBarLayout() + && profile.isPhone && !profile.isLandscape; UiThreadHelper.runAsyncCommand(this, SET_SHELF_HEIGHT, visible ? 1 : 0, profile.hotseatBarSizePx); if (state == NORMAL && !inTransition) {