Merge "Removing old logs" into sc-dev (b72be3e2) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −15

Original line number	Diff line number	Diff line
		@@ -126,26 +126,11 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr

		@Override
		protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "PortraitStatesTouchController.getTargetState");
		}
		if (fromState == ALL_APPS && !isDragTowardPositive) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
		"PortraitStatesTouchController.getTargetState 1");
		}
		return NORMAL;
		} else if (fromState == OVERVIEW) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
		"PortraitStatesTouchController.getTargetState 2");
		}
		return isDragTowardPositive ? OVERVIEW : NORMAL;
		} else if (fromState == NORMAL && isDragTowardPositive) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
		"PortraitStatesTouchController.getTargetState 3");
		}
		return ALL_APPS;
		}
		return fromState;

+0 −3

Original line number	Diff line number	Diff line
		@@ -187,9 +187,6 @@ public final class LauncherActivityInterface extends

		@Override
		public boolean switchToRecentsIfVisible(Runnable onCompleteCallback) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "switchToRecentsIfVisible");
		}
		Launcher launcher = getVisibleLauncher();
		if (launcher == null) {
		return false;

+0 −7

Original line number	Diff line number	Diff line
		@@ -302,10 +302,6 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
		}

		private PendingAnimation createAnimationToNewWorkspaceInternal(final STATE_TYPE state) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "createAnimationToNewWorkspaceInternal: "
		+ state);
		}
		PendingAnimation builder = new PendingAnimation(mConfig.duration);
		if (mConfig.getAnimComponents() != 0) {
		for (StateHandler handler : getStateHandlers()) {
		@@ -328,9 +324,6 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {

		@Override
		public void onAnimationSuccess(Animator animator) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "onAnimationSuccess: " + state);
		}
		onStateTransitionEnd(state);
		}
		};

+0 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ public final class TestProtocol {
		public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";

		public static final String PERMANENT_DIAG_TAG = "TaplTarget";
		public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
		public static final String NO_SWIPE_TO_HOME = "b/158017601";
		public static final String WORK_PROFILE_REMOVED = "b/159671700";
		public static final String TIS_NO_EVENTS = "b/180915942";

+0 −4

Original line number	Diff line number	Diff line
		@@ -202,10 +202,6 @@ public abstract class AbstractStateChangeTouchController

		mFromState = newFromState;
		mToState = newToState;
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "reinitCurrentAnimation: "
		+ newToState.ordinal + " " + getClass().getSimpleName());
		}

		mStartProgress = 0;
		mPassedOverviewAtomicThreshold = false;