Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9c0bbee authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

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

Change-Id: If6c10b70709435451c05d0345d38e4a032826184
parents 7c47583c f75d7c95

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -67,7 +67,6 @@ import com.android.launcher3.util.IntArray; 
import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.UiThreadHelper;

import com.android.launcher3.util.UiThreadHelper;

import com.android.launcher3.util.UiThreadHelper.AsyncCommand;

import com.android.launcher3.util.UiThreadHelper.AsyncCommand;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.SysUINavigationMode;

import com.android.quickstep.SysUINavigationMode;

import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.SystemUiProxy;

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 willUserBeActive = (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0;

        boolean visible = (state == NORMAL || state == OVERVIEW)

        boolean visible = (state == NORMAL || state == OVERVIEW)

                && (willUserBeActive || isUserActive())

                && (willUserBeActive || isUserActive())

                && !profile.isVerticalBarLayout();

                && !profile.isVerticalBarLayout()

                && profile.isPhone && !profile.isLandscape;

        UiThreadHelper.runAsyncCommand(this, SET_SHELF_HEIGHT, visible ? 1 : 0,

        UiThreadHelper.runAsyncCommand(this, SET_SHELF_HEIGHT, visible ? 1 : 0,

                profile.hotseatBarSizePx);

                profile.hotseatBarSizePx);

        if (state == NORMAL && !inTransition) {

        if (state == NORMAL && !inTransition) {