From 8559ae324c3509a9594f1c94db66a0138d0f3e3a Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Fri, 16 Apr 2021 11:59:07 -0700 Subject: [PATCH] Update TwoButtonNavbarTouchController logs - Fix wrong bug number - Log when we intercept and reinit to a state rather than in getTargetState() which is used to determine possible swipe directions too (which makes the logs confusing) Test: run TaplTestsQuickstep#testOverviewActions Bug: 177316094 Change-Id: Ibe5db6317c16c429c9c46bf237d3f8adc1458037 --- .../TwoButtonNavbarTouchController.java | 27 ++++++++++++++----- .../launcher3/testing/TestProtocol.java | 2 +- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java index c4263290f7..b0d0b1528c 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java @@ -98,23 +98,35 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont return mLauncher.isInState(NORMAL); } + @Override + public boolean onControllerInterceptTouchEvent(MotionEvent ev) { + boolean intercept = super.onControllerInterceptTouchEvent(ev); + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, + "2 button touch controller intercept touch? " + intercept); + } + return intercept; + } + @Override protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) { - final LauncherState targetState; if (mIsTransposed) { boolean draggingFromNav = mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive; - targetState = draggingFromNav ? HINT_STATE_TWO_BUTTON : NORMAL; + return draggingFromNav ? HINT_STATE_TWO_BUTTON : NORMAL; } else { LauncherState startState = mStartState != null ? mStartState : fromState; - targetState = isDragTowardPositive ^ (startState == OVERVIEW) - ? HINT_STATE_TWO_BUTTON : NORMAL; + return isDragTowardPositive ^ (startState == OVERVIEW) ? HINT_STATE_TWO_BUTTON : NORMAL; } + } + + @Override + protected void onReinitToState(LauncherState newToState) { + super.onReinitToState(newToState); if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "Target state: " + targetState); + Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "onReinitToState: " + newToState); } - return targetState; } @Override @@ -163,6 +175,9 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont @Override protected void onSwipeInteractionCompleted(LauncherState targetState) { super.onSwipeInteractionCompleted(targetState); + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "Reached state: " + targetState); + } if (!mIsTransposed) { mContinuousTouchCount++; } diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 60dd0f353d..d747a06313 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -114,5 +114,5 @@ public final class TestProtocol { public static final String WORK_PROFILE_REMOVED = "b/159671700"; public static final String TIS_NO_EVENTS = "b/180915942"; public static final String GET_RECENTS_FAILED = "b/177472267"; - public static final String TWO_BUTTON_NORMAL_NOT_OVERVIEW = "b/13714484"; + public static final String TWO_BUTTON_NORMAL_NOT_OVERVIEW = "b/177316094"; }