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

Commit bd91b11b authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Launcher landscape gesture nav"

parents 8f02dbc6 38b76942

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ public final class FallbackActivityControllerHelper implements 
    @Override

    public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {

        LayoutUtils.calculateFallbackTaskSize(context, dp, outRect);

        if (dp.isVerticalBarLayout()) {

        if (dp.isVerticalBarLayout()

                && !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(context)) {

            Rect targetInsets = dp.getInsets();

            int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;

            return dp.hotseatBarSizePx + hotseatInset;

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe 
    @Override

    public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {

        LayoutUtils.calculateLauncherTaskSize(context, dp, outRect);

        if (dp.isVerticalBarLayout()) {

        if (dp.isVerticalBarLayout()

                && !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(context)) {

            Rect targetInsets = dp.getInsets();

            int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;

            return dp.hotseatBarSizePx + hotseatInset;

quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java

+4 −2
Original line number Diff line number Diff line
@@ -284,11 +284,13 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
    }



    private boolean isNavBarOnRight() {

        return mDisplayRotation == Surface.ROTATION_90 && mStableInsets.right > 0;

        return !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(getBaseContext())

                && mDisplayRotation == Surface.ROTATION_90 && mStableInsets.right > 0;

    }



    private boolean isNavBarOnLeft() {

        return mDisplayRotation == Surface.ROTATION_270 && mStableInsets.left > 0;

        return !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(getBaseContext())

                && mDisplayRotation == Surface.ROTATION_270 && mStableInsets.left > 0;

    }



    private void startTouchTrackingForWindowAnimation(long touchTimeMs) {