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

Commit dbd47e9f authored by Saumya Prakash's avatar Saumya Prakash Committed by Android (Google) Code Review
Browse files

Merge "Remove extraneous transition from Overview to Home screen" into udc-qpr-dev

parents b75add7a c4cc4b13

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

+0 −3
Original line number Diff line number Diff line
@@ -119,9 +119,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch 
    protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {

        if (fromState == NORMAL && mDidTouchStartInNavBar) {

            return HINT_STATE;

        } else if (fromState == OVERVIEW && isDragTowardPositive) {

            // Don't allow swiping up to all apps.

            return OVERVIEW;

        }

        return super.getTargetState(fromState, isDragTowardPositive);

    }

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java

+0 −2
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
            return FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get()

                    ? mLauncher.getStateManager().getLastState()

                    : NORMAL;

        } else if (fromState == OVERVIEW) {

            return isDragTowardPositive ? OVERVIEW : NORMAL;

        } else if (fromState == NORMAL && isDragTowardPositive) {

            return ALL_APPS;

        }