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

Commit e809f3d7 authored by Winson Chung's avatar Winson Chung
Browse files

Launcher landscape gesture nav 

Bug: 128129398
Test: Rotate to landscape, ensure you can use gesture nav
Change-Id: I4630cbae9bf1cbabd83fb72d5eb09c9a435950e9
(cherry picked from commit 38b76942)
parent a8bd0527

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

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.quickstep;



import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;



import android.animation.Animator;
@@ -59,7 +60,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()

                && SysUINavigationMode.INSTANCE.get(context).getMode() != NO_BUTTON) {

            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

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.launcher3.allapps.AllAppsTransitionController.SPRING_D 
import static com.android.launcher3.allapps.AllAppsTransitionController.SPRING_STIFFNESS;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -74,7 +75,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()

                && SysUINavigationMode.INSTANCE.get(context).getMode() != NO_BUTTON) {

            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

+5 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.view.MotionEvent.INVALID_POINTER_ID; 
import static com.android.launcher3.util.RaceConditionTracker.ENTER;

import static com.android.launcher3.util.RaceConditionTracker.EXIT;

import static com.android.launcher3.Utilities.EDGE_NAV_BAR;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -284,11 +285,13 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
    }



    private boolean isNavBarOnRight() {

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

        return SysUINavigationMode.INSTANCE.get(getBaseContext()).getMode() != NO_BUTTON

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

    }



    private boolean isNavBarOnLeft() {

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

        return SysUINavigationMode.INSTANCE.get(getBaseContext()).getMode() != NO_BUTTON

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

    }



    private void startTouchTrackingForWindowAnimation(long touchTimeMs) {