Update active gesture error detection
- Removed some unused error detection event tracking - Updated incorrect event tracking - Added debug new debug gesture logs Bug: 254250355 Test: attempted several gestures and checked logs Change-Id: Ia1291a08a9a5842addb93c30eb6d21c6c60916c7
This commit is contained in:
Schneider Victor-tulias
@@ -33,10 +33,11 @@ public class ActiveGestureErrorDetector {
|
||||
* Enums associated to gesture navigation events.
|
||||
*/
|
||||
public enum GestureEvent {
|
||||
MOTION_DOWN, MOTION_UP, SET_END_TARGET, SET_END_TARGET_HOME, SET_END_TARGET_LAST_TASK,
|
||||
SET_END_TARGET_NEW_TASK, ON_SETTLED_ON_END_TARGET, START_RECENTS_ANIMATION,
|
||||
FINISH_RECENTS_ANIMATION, CANCEL_RECENTS_ANIMATION, SET_ON_PAGE_TRANSITION_END_CALLBACK,
|
||||
CANCEL_CURRENT_ANIMATION, CLEANUP_SCREENSHOT, SCROLLER_ANIMATION_ABORTED, TASK_APPEARED,
|
||||
MOTION_DOWN, MOTION_UP, SET_END_TARGET, SET_END_TARGET_HOME, SET_END_TARGET_NEW_TASK,
|
||||
ON_SETTLED_ON_END_TARGET, START_RECENTS_ANIMATION, FINISH_RECENTS_ANIMATION,
|
||||
CANCEL_RECENTS_ANIMATION, SET_ON_PAGE_TRANSITION_END_CALLBACK, CANCEL_CURRENT_ANIMATION,
|
||||
CLEANUP_SCREENSHOT, SCROLLER_ANIMATION_ABORTED, TASK_APPEARED, EXPECTING_TASK_APPEARED,
|
||||
FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER,
|
||||
|
||||
/**
|
||||
* These GestureEvents are specifically associated to state flags that get set in
|
||||
@@ -91,35 +92,40 @@ public class ActiveGestureErrorDetector {
|
||||
case MOTION_UP:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.MOTION_DOWN),
|
||||
/* errorMessage= */ prefix + "\t\tMotion up detected before/without"
|
||||
prefix,
|
||||
/* errorMessage= */ "Motion up detected before/without"
|
||||
+ " motion down.",
|
||||
writer);
|
||||
break;
|
||||
case ON_SETTLED_ON_END_TARGET:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.SET_END_TARGET),
|
||||
/* errorMessage= */ prefix + "\t\tonSettledOnEndTarget called "
|
||||
prefix,
|
||||
/* errorMessage= */ "onSettledOnEndTarget called "
|
||||
+ "before/without setEndTarget.",
|
||||
writer);
|
||||
break;
|
||||
case FINISH_RECENTS_ANIMATION:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.START_RECENTS_ANIMATION),
|
||||
/* errorMessage= */ prefix + "\t\tfinishRecentsAnimation called "
|
||||
prefix,
|
||||
/* errorMessage= */ "finishRecentsAnimation called "
|
||||
+ "before/without startRecentsAnimation.",
|
||||
writer);
|
||||
break;
|
||||
case CANCEL_RECENTS_ANIMATION:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.START_RECENTS_ANIMATION),
|
||||
/* errorMessage= */ prefix + "\t\tcancelRecentsAnimation called "
|
||||
prefix,
|
||||
/* errorMessage= */ "cancelRecentsAnimation called "
|
||||
+ "before/without startRecentsAnimation.",
|
||||
writer);
|
||||
break;
|
||||
case CLEANUP_SCREENSHOT:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.STATE_SCREENSHOT_CAPTURED),
|
||||
/* errorMessage= */ prefix + "\t\trecents activity screenshot was "
|
||||
prefix,
|
||||
/* errorMessage= */ "recents activity screenshot was "
|
||||
+ "cleaned up before/without STATE_SCREENSHOT_CAPTURED "
|
||||
+ "being set.",
|
||||
writer);
|
||||
@@ -129,48 +135,66 @@ public class ActiveGestureErrorDetector {
|
||||
encounteredEvents.contains(GestureEvent.SET_END_TARGET_HOME)
|
||||
&& !encounteredEvents.contains(
|
||||
GestureEvent.ON_SETTLED_ON_END_TARGET),
|
||||
/* errorMessage= */ prefix + "\t\trecents view scroller animation "
|
||||
prefix,
|
||||
/* errorMessage= */ "recents view scroller animation "
|
||||
+ "aborted after setting end target HOME, but before"
|
||||
+ " settling on end target.",
|
||||
writer);
|
||||
break;
|
||||
case TASK_APPEARED:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.SET_END_TARGET_LAST_TASK)
|
||||
&& !encounteredEvents.contains(
|
||||
GestureEvent.SET_END_TARGET_NEW_TASK),
|
||||
/* errorMessage= */ prefix + "\t\tonTasksAppeared called "
|
||||
+ "before/without setting end target to last or new task",
|
||||
!encounteredEvents.contains(GestureEvent.SET_END_TARGET_NEW_TASK),
|
||||
prefix,
|
||||
/* errorMessage= */ "onTasksAppeared called "
|
||||
+ "before/without setting end target to new task",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.EXPECTING_TASK_APPEARED),
|
||||
prefix,
|
||||
/* errorMessage= */ "onTasksAppeared was not expected to be called",
|
||||
writer);
|
||||
break;
|
||||
case EXPECTING_TASK_APPEARED:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.SET_END_TARGET_NEW_TASK),
|
||||
prefix,
|
||||
/* errorMessage= */ "expecting onTasksAppeared to be called "
|
||||
+ "before/without setting end target to new task",
|
||||
writer);
|
||||
break;
|
||||
case STATE_GESTURE_COMPLETED:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.MOTION_UP),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_GESTURE_COMPLETED set "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_GESTURE_COMPLETED set "
|
||||
+ "before/without motion up.",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.STATE_GESTURE_STARTED),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_GESTURE_COMPLETED set "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_GESTURE_COMPLETED set "
|
||||
+ "before/without STATE_GESTURE_STARTED.",
|
||||
writer);
|
||||
break;
|
||||
case STATE_GESTURE_CANCELLED:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.MOTION_UP),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_GESTURE_CANCELLED set "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_GESTURE_CANCELLED set "
|
||||
+ "before/without motion up.",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.STATE_GESTURE_STARTED),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_GESTURE_CANCELLED set "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_GESTURE_CANCELLED set "
|
||||
+ "before/without STATE_GESTURE_STARTED.",
|
||||
writer);
|
||||
break;
|
||||
case STATE_SCREENSHOT_CAPTURED:
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.STATE_CAPTURE_SCREENSHOT),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_SCREENSHOT_CAPTURED set "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_SCREENSHOT_CAPTURED set "
|
||||
+ "before/without STATE_CAPTURE_SCREENSHOT.",
|
||||
writer);
|
||||
break;
|
||||
@@ -178,7 +202,8 @@ public class ActiveGestureErrorDetector {
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(
|
||||
GestureEvent.SET_ON_PAGE_TRANSITION_END_CALLBACK),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_RECENTS_SCROLLING_FINISHED "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_RECENTS_SCROLLING_FINISHED "
|
||||
+ "set before/without calling "
|
||||
+ "setOnPageTransitionEndCallback.",
|
||||
writer);
|
||||
@@ -187,16 +212,19 @@ public class ActiveGestureErrorDetector {
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(
|
||||
GestureEvent.START_RECENTS_ANIMATION),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_RECENTS_ANIMATION_CANCELED "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_RECENTS_ANIMATION_CANCELED "
|
||||
+ "set before/without startRecentsAnimation.",
|
||||
writer);
|
||||
break;
|
||||
case MOTION_DOWN:
|
||||
case SET_END_TARGET:
|
||||
case SET_END_TARGET_HOME:
|
||||
case SET_END_TARGET_NEW_TASK:
|
||||
case START_RECENTS_ANIMATION:
|
||||
case SET_ON_PAGE_TRANSITION_END_CALLBACK:
|
||||
case CANCEL_CURRENT_ANIMATION:
|
||||
case FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER:
|
||||
case STATE_GESTURE_STARTED:
|
||||
case STATE_END_TARGET_ANIMATION_FINISHED:
|
||||
case STATE_CAPTURE_SCREENSHOT:
|
||||
@@ -210,31 +238,36 @@ public class ActiveGestureErrorDetector {
|
||||
// Check that all required events were found.
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.MOTION_DOWN),
|
||||
/* errorMessage= */ prefix + "\t\tMotion down never detected.",
|
||||
prefix,
|
||||
/* errorMessage= */ "Motion down never detected.",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
!encounteredEvents.contains(GestureEvent.MOTION_UP),
|
||||
/* errorMessage= */ prefix + "\t\tMotion up never detected.",
|
||||
prefix,
|
||||
/* errorMessage= */ "Motion up never detected.",
|
||||
writer);
|
||||
|
||||
errorDetected |= printErrorIfTrue(
|
||||
/* condition= */ encounteredEvents.contains(GestureEvent.SET_END_TARGET)
|
||||
&& !encounteredEvents.contains(GestureEvent.ON_SETTLED_ON_END_TARGET),
|
||||
/* errorMessage= */ prefix + "\t\tsetEndTarget was called, but "
|
||||
prefix,
|
||||
/* errorMessage= */ "setEndTarget was called, but "
|
||||
+ "onSettledOnEndTarget wasn't.",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
/* condition= */ encounteredEvents.contains(GestureEvent.SET_END_TARGET)
|
||||
&& !encounteredEvents.contains(
|
||||
GestureEvent.STATE_END_TARGET_ANIMATION_FINISHED),
|
||||
/* errorMessage= */ prefix + "\t\tsetEndTarget was called, but "
|
||||
prefix,
|
||||
/* errorMessage= */ "setEndTarget was called, but "
|
||||
+ "STATE_END_TARGET_ANIMATION_FINISHED was never set.",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
/* condition= */ encounteredEvents.contains(GestureEvent.SET_END_TARGET)
|
||||
&& !encounteredEvents.contains(
|
||||
GestureEvent.STATE_RECENTS_SCROLLING_FINISHED),
|
||||
/* errorMessage= */ prefix + "\t\tsetEndTarget was called, but "
|
||||
prefix,
|
||||
/* errorMessage= */ "setEndTarget was called, but "
|
||||
+ "STATE_RECENTS_SCROLLING_FINISHED was never set.",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
@@ -243,7 +276,8 @@ public class ActiveGestureErrorDetector {
|
||||
&& encounteredEvents.contains(
|
||||
GestureEvent.STATE_RECENTS_SCROLLING_FINISHED)
|
||||
&& !encounteredEvents.contains(GestureEvent.ON_SETTLED_ON_END_TARGET),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_END_TARGET_ANIMATION_FINISHED and "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_END_TARGET_ANIMATION_FINISHED and "
|
||||
+ "STATE_RECENTS_SCROLLING_FINISHED were set, but onSettledOnEndTarget "
|
||||
+ "wasn't called.",
|
||||
writer);
|
||||
@@ -253,7 +287,8 @@ public class ActiveGestureErrorDetector {
|
||||
GestureEvent.START_RECENTS_ANIMATION)
|
||||
&& !encounteredEvents.contains(GestureEvent.FINISH_RECENTS_ANIMATION)
|
||||
&& !encounteredEvents.contains(GestureEvent.CANCEL_RECENTS_ANIMATION),
|
||||
/* errorMessage= */ prefix + "\t\tstartRecentsAnimation was called, but "
|
||||
prefix,
|
||||
/* errorMessage= */ "startRecentsAnimation was called, but "
|
||||
+ "finishRecentsAnimation and cancelRecentsAnimation weren't.",
|
||||
writer);
|
||||
|
||||
@@ -261,7 +296,8 @@ public class ActiveGestureErrorDetector {
|
||||
/* condition= */ encounteredEvents.contains(GestureEvent.STATE_GESTURE_STARTED)
|
||||
&& !encounteredEvents.contains(GestureEvent.STATE_GESTURE_COMPLETED)
|
||||
&& !encounteredEvents.contains(GestureEvent.STATE_GESTURE_CANCELLED),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_GESTURE_STARTED was set, but "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_GESTURE_STARTED was set, but "
|
||||
+ "STATE_GESTURE_COMPLETED and STATE_GESTURE_CANCELLED weren't.",
|
||||
writer);
|
||||
|
||||
@@ -269,7 +305,8 @@ public class ActiveGestureErrorDetector {
|
||||
/* condition= */ encounteredEvents.contains(
|
||||
GestureEvent.STATE_CAPTURE_SCREENSHOT)
|
||||
&& !encounteredEvents.contains(GestureEvent.STATE_SCREENSHOT_CAPTURED),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_CAPTURE_SCREENSHOT was set, but "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_CAPTURE_SCREENSHOT was set, but "
|
||||
+ "STATE_SCREENSHOT_CAPTURED wasn't.",
|
||||
writer);
|
||||
|
||||
@@ -278,15 +315,18 @@ public class ActiveGestureErrorDetector {
|
||||
GestureEvent.SET_ON_PAGE_TRANSITION_END_CALLBACK)
|
||||
&& !encounteredEvents.contains(
|
||||
GestureEvent.STATE_RECENTS_SCROLLING_FINISHED),
|
||||
/* errorMessage= */ prefix + "\t\tsetOnPageTransitionEndCallback called, but "
|
||||
prefix,
|
||||
/* errorMessage= */ "setOnPageTransitionEndCallback called, but "
|
||||
+ "STATE_RECENTS_SCROLLING_FINISHED wasn't set.",
|
||||
writer);
|
||||
|
||||
errorDetected |= printErrorIfTrue(
|
||||
/* condition= */ !encounteredEvents.contains(
|
||||
GestureEvent.CANCEL_CURRENT_ANIMATION)
|
||||
/* condition= */ encounteredEvents.contains(
|
||||
GestureEvent.FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER)
|
||||
&& !encounteredEvents.contains(GestureEvent.CANCEL_CURRENT_ANIMATION)
|
||||
&& !encounteredEvents.contains(GestureEvent.STATE_HANDLER_INVALIDATED),
|
||||
/* errorMessage= */ prefix + "\t\tAbsSwipeUpHandler.cancelCurrentAnimation "
|
||||
prefix,
|
||||
/* errorMessage= */ "AbsSwipeUpHandler.cancelCurrentAnimation "
|
||||
+ "wasn't called and STATE_HANDLER_INVALIDATED wasn't set.",
|
||||
writer);
|
||||
|
||||
@@ -294,23 +334,17 @@ public class ActiveGestureErrorDetector {
|
||||
/* condition= */ encounteredEvents.contains(
|
||||
GestureEvent.STATE_RECENTS_ANIMATION_CANCELED)
|
||||
&& !encounteredEvents.contains(GestureEvent.CLEANUP_SCREENSHOT),
|
||||
/* errorMessage= */ prefix + "\t\tSTATE_RECENTS_ANIMATION_CANCELED was set but "
|
||||
prefix,
|
||||
/* errorMessage= */ "STATE_RECENTS_ANIMATION_CANCELED was set but "
|
||||
+ "the task screenshot wasn't cleaned up.",
|
||||
writer);
|
||||
|
||||
errorDetected |= printErrorIfTrue(
|
||||
/* condition= */ encounteredEvents.contains(
|
||||
GestureEvent.SET_END_TARGET_LAST_TASK)
|
||||
GestureEvent.EXPECTING_TASK_APPEARED)
|
||||
&& !encounteredEvents.contains(GestureEvent.TASK_APPEARED),
|
||||
/* errorMessage= */ prefix + "\t\tend target set to last task, but "
|
||||
+ "onTaskAppeared wasn't called.",
|
||||
writer);
|
||||
errorDetected |= printErrorIfTrue(
|
||||
/* condition= */ encounteredEvents.contains(
|
||||
GestureEvent.SET_END_TARGET_NEW_TASK)
|
||||
&& !encounteredEvents.contains(GestureEvent.TASK_APPEARED),
|
||||
/* errorMessage= */ prefix + "\t\tend target set to new task, but "
|
||||
+ "onTaskAppeared wasn't called.",
|
||||
prefix,
|
||||
/* errorMessage= */ "onTaskAppeared was expected to be called but wasn't.",
|
||||
writer);
|
||||
|
||||
if (!errorDetected) {
|
||||
@@ -320,11 +354,11 @@ public class ActiveGestureErrorDetector {
|
||||
}
|
||||
|
||||
private static boolean printErrorIfTrue(
|
||||
boolean condition, String errorMessage, PrintWriter writer) {
|
||||
boolean condition, String prefix, String errorMessage, PrintWriter writer) {
|
||||
if (!condition) {
|
||||
return false;
|
||||
}
|
||||
writer.println(errorMessage);
|
||||
writer.println(prefix + "\t\t- " + errorMessage);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user