Merge "Add STATE_LAUNCHER_DRAWN printing" into tm-qpr-dev (5f4e93d6) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		return ActiveGestureErrorDetector.GestureEvent.STATE_CAPTURE_SCREENSHOT;
		} else if (stateFlag == STATE_HANDLER_INVALIDATED) {
		return ActiveGestureErrorDetector.GestureEvent.STATE_HANDLER_INVALIDATED;
		} else if (stateFlag == STATE_LAUNCHER_DRAWN) {
		return ActiveGestureErrorDetector.GestureEvent.STATE_LAUNCHER_DRAWN;
		}
		return null;
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -116,9 +116,15 @@ public class MultiStateCallback {
		if (gestureEvent == null) {
		continue;
		}
		if (gestureEvent.mLogEvent && gestureEvent.mTrackEvent) {
		ActiveGestureLog.INSTANCE.addLog(gestureEvent.name(), gestureEvent);
		} else if (gestureEvent.mLogEvent) {
		ActiveGestureLog.INSTANCE.addLog(gestureEvent.name());
		} else if (gestureEvent.mTrackEvent) {
		ActiveGestureLog.INSTANCE.trackEvent(gestureEvent);
		}
		}
		}

		/**
		* Adds the provided state flags to the global state and executes any change handlers

+14 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,19 @@ public class ActiveGestureErrorDetector {
		STATE_GESTURE_STARTED, STATE_GESTURE_COMPLETED, STATE_GESTURE_CANCELLED,
		STATE_END_TARGET_ANIMATION_FINISHED, STATE_RECENTS_SCROLLING_FINISHED,
		STATE_CAPTURE_SCREENSHOT, STATE_SCREENSHOT_CAPTURED, STATE_HANDLER_INVALIDATED,
		STATE_RECENTS_ANIMATION_CANCELED
		STATE_RECENTS_ANIMATION_CANCELED, STATE_LAUNCHER_DRAWN(true, false);

		public final boolean mLogEvent;
		public final boolean mTrackEvent;

		GestureEvent() {
		this(false, true);
		}

		GestureEvent(boolean logEvent, boolean trackEvent) {
		mLogEvent = logEvent;
		mTrackEvent = trackEvent;
		}
		}

		private ActiveGestureErrorDetector() {}
		@@ -168,6 +180,7 @@ public class ActiveGestureErrorDetector {
		case STATE_END_TARGET_ANIMATION_FINISHED:
		case STATE_CAPTURE_SCREENSHOT:
		case STATE_HANDLER_INVALIDATED:
		case STATE_LAUNCHER_DRAWN:
		default:
		// No-Op
		}