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

Commit 672ed10a authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Skip shelf adjustment for PIP when quickscrubbing am: edd4f89f 

Change-Id: I3ae41c47d1472dc9e3c63814223a186e06313ec7
parents 6b42b276 edd4f89f

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.android.launcher3.LauncherState.NORMAL; 
import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;

import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;

import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;

import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;

import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;





import android.animation.AnimatorSet;

import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator;
@@ -46,7 +45,6 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.TouchController;

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.util.RemoteAnimationTargetSet;

import com.android.quickstep.util.RemoteFadeOutAnimationListener;

import com.android.quickstep.util.RemoteFadeOutAnimationListener;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.system.ActivityCompat;

import com.android.systemui.shared.system.ActivityCompat;
@@ -171,7 +169,8 @@ public class UiFactory { 
        LauncherState state = launcher.getStateManager().getState();

        LauncherState state = launcher.getStateManager().getState();

        DeviceProfile profile = launcher.getDeviceProfile();

        DeviceProfile profile = launcher.getDeviceProfile();

        WindowManagerWrapper.getInstance().setShelfHeight(

        WindowManagerWrapper.getInstance().setShelfHeight(

                state != ALL_APPS && launcher.isUserActive() && !profile.isVerticalBarLayout(),

                (state == NORMAL || state == OVERVIEW) && launcher.isUserActive()

                        && !profile.isVerticalBarLayout(),

                profile.hotseatBarSizePx);

                profile.hotseatBarSizePx);





        if (state == NORMAL) {

        if (state == NORMAL) {