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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24587641

Change-Id: I350f08b5d09a9f7c17a93529b0a9bfd033e2a04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Saumya Prakash
2023-08-30 23:27:09 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 5 deletions

View File

@@ -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);
}

View File

@@ -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;
}