diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index f77b60b977..87458149eb 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -32,6 +32,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_O import android.animation.TimeInterpolator; import android.animation.ValueAnimator; +import android.util.Log; import android.view.MotionEvent; import android.view.animation.Interpolator; @@ -43,6 +44,7 @@ import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.states.StateAnimationConfig.AnimationFlags; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.touch.AbstractStateChangeTouchController; import com.android.launcher3.touch.SingleAxisSwipeDetector; import com.android.launcher3.uioverrides.states.OverviewState; @@ -130,11 +132,22 @@ 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) { // Should swipe down go to OVERVIEW instead? + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, + "PortraitStatesTouchController.getTargetState 1"); + } return TouchInteractionService.isConnected() ? mLauncher.getStateManager().getLastState() : NORMAL; } else if (fromState == OVERVIEW) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, + "PortraitStatesTouchController.getTargetState 2"); + } LauncherState positiveDragTarget = ALL_APPS; if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(mLauncher)) { // Don't allow swiping up to all apps. @@ -142,6 +155,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr } return isDragTowardPositive ? positiveDragTarget : NORMAL; } else if (fromState == NORMAL && isDragTowardPositive) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, + "PortraitStatesTouchController.getTargetState 3"); + } int stateFlags = SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags(); return mAllowDragToOverview && TouchInteractionService.isConnected() && (stateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0 diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 52e2ab842f..2e63ccf19f 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -201,7 +201,7 @@ public abstract class AbstractStateChangeTouchController mToState = newToState; if (TestProtocol.sDebugTracing) { Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "reinitCurrentAnimation: " - + newToState.ordinal); + + newToState.ordinal + " " + getClass().getSimpleName()); } mStartProgress = 0;