Don't set shelf height if we are in landscape. am: e50d7a2f54

Change-Id: Ib7c5c785e63822614e6112482ecbcaf77e29bfb2
This commit is contained in:
Ben Lin
2020-05-27 03:19:40 +00:00
committed by Automerger Merge Worker
@@ -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) {