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

Commit 3541ac10 authored Apr 06, 2018 by Tony Wickham Committed by Android (Google) Code Review Apr 06, 2018

Merge "When dragging past first or last state, don't reinit target" into ub-launcher3-master

parents a4984f3d 6270a0ea

quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -60,12 +60,13 @@ public class LandscapeStatesTouchController extends PortraitStatesTouchControlle

		@Override
		protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
		if (fromState == ALL_APPS) {
		if (fromState == ALL_APPS && !isDragTowardPositive) {
		// Should swipe down go to OVERVIEW instead?
		return TouchInteractionService.isConnected() ?
		mLauncher.getStateManager().getLastState() : NORMAL;
		} else {
		} else if (isDragTowardPositive) {
		return ALL_APPS;
		}
		return fromState;
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr

		@Override
		protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
		if (fromState == ALL_APPS) {
		if (fromState == ALL_APPS && !isDragTowardPositive) {
		// Should swipe down go to OVERVIEW instead?
		return TouchInteractionService.isConnected() ?
		mLauncher.getStateManager().getLastState() : NORMAL;

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,10 @@ public abstract class AbstractStateChangeTouchController extends AnimatorListene
		return mLauncher.getAllAppsController().getShiftRange();
		}

		/**
		* Returns the state to go to from fromState given the drag direction. If there is no state in
		* that direction, returns fromState.
		*/
		protected abstract LauncherState getTargetState(LauncherState fromState,
		boolean isDragTowardPositive);

src_ui_overrides/com/android/launcher3/uioverrides/AllAppsSwipeController.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,12 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController {

		@Override
		protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
		return fromState == ALL_APPS ? NORMAL : ALL_APPS;
		if (fromState == NORMAL && isDragTowardPositive) {
		return ALL_APPS;
		} else if (fromState == ALL_APPS && !isDragTowardPositive) {
		return NORMAL;
		}
		return fromState;
		}

		@Override