From c4cc4b13b1a63d4c685680ab2559c3c4e976b187 Mon Sep 17 00:00:00 2001 From: Saumya Prakash Date: Tue, 29 Aug 2023 22:04:07 +0000 Subject: [PATCH] Remove extraneous transition from Overview to Home screen Previously, users used to be able to swipe down near the bottom of the screen to leave overview. This was causing the taskbar to animate to home while still in overview (and causing jank). Since this isn't expected behavior for how to leave overview, this change removes that method. Flag: N/A Fix: 284416178 Test: Completed multiple transitions (ex. Overview to home) with 3 button nav and gesture nav. Ensured swiping down from below the recents task does not go to the home screen while not affecting other transitions. Change-Id: I8cdfde71117dd947174d9c3c3a7f834fbeaddcca --- .../NoButtonNavbarToOverviewTouchController.java | 3 --- .../touchcontrollers/PortraitStatesTouchController.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java index 40753882d4..ca598c8411 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java @@ -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); } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index 454a1f5e91..e30fe667ff 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -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; }