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

Commit a6986529 authored Aug 30, 2023 by Saumya Prakash Committed by Automerger Merge Worker Aug 30, 2023

Merge "Remove extraneous transition from Overview to Home screen" into...

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

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

Change-Id: I6c3c15584cf07e88748e020356bcf1fed30c9314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 2ba6ef0c e5b09cd7

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