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

Commit 6fc623d0 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Skip setShelfHeight if Launcher is not started 

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/gIqsb2WlagwQ8ly3q3RHI0
Bug: 184797356
Test: atest WMShellFlickerTests:PipShelfHeightTest
Test: manual, see video
Change-Id: Ia02b2da110b05341dfbf92b9d8d7fca4bbf6bdb3
parent e74e32ab

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

+12 −8
Original line number Diff line number Diff line
@@ -200,14 +200,18 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
     */

    private void onStateOrResumeChanging(boolean inTransition) {

        LauncherState state = getStateManager().getState();

        boolean started = ((getActivityFlags() & ACTIVITY_STATE_STARTED)) != 0;

        if (started) {

            DeviceProfile profile = getDeviceProfile();

        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)

                    && (willUserBeActive || isUserActive())

                    && !profile.isVerticalBarLayout()

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

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

                    profile.hotseatBarSizePx);

        }

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

            ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false);

        }