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

Commit 4573658e authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Android (Google) Code Review
Browse files

Merge "Remove enable_pip_keep_clear_algorithm flag" into udc-qpr-dev

parents 73c3611b 23ed054a

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

+2 −9
Original line number Diff line number Diff line
@@ -193,9 +193,6 @@ import java.util.function.Predicate; 
import java.util.stream.Stream;



public class QuickstepLauncher extends Launcher {



    public static final boolean ENABLE_PIP_KEEP_CLEAR_ALGORITHM =

            SystemProperties.getBoolean("persist.wm.debug.enable_pip_keep_clear_algorithm", true);

    private static final boolean TRACE_LAYOUTS =

            SystemProperties.getBoolean("persist.debug.trace_layouts", false);

    private static final String TRACE_RELAYOUT_CLASS =
@@ -435,12 +432,8 @@ public class QuickstepLauncher extends Launcher { 
            boolean visible = (state == NORMAL || state == OVERVIEW)

                    && (willUserBeActive || isUserActive())

                    && !profile.isVerticalBarLayout();

            if (ENABLE_PIP_KEEP_CLEAR_ALGORITHM)  {

            SystemUiProxy.INSTANCE.get(this)

                    .setLauncherKeepClearAreaHeight(visible, profile.hotseatBarSizePx);

            } else {

                SystemUiProxy.INSTANCE.get(this).setShelfHeight(visible, profile.hotseatBarSizePx);

            }

        }

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

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

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+0 −6
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH 
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_GESTURE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_LEFT;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT;

import static com.android.launcher3.uioverrides.QuickstepLauncher.ENABLE_PIP_KEEP_CLEAR_ALGORITHM;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
@@ -1753,11 +1752,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


    private Rect getKeepClearAreaForHotseat() {

        Rect keepClearArea;

        if (!ENABLE_PIP_KEEP_CLEAR_ALGORITHM) {

            // make the height equal to hotseatBarSizePx only

            keepClearArea = new Rect(0, 0, 0, mDp.hotseatBarSizePx);

            return keepClearArea;

        }

        // the keep clear area in global screen coordinates, in pixels

        if (mDp.isPhone) {

            if (mDp.isSeascape()) {