add more data collection points to ResearchLogger (attempt #2)

the new points are all at Log.x() positions; only those appearing directly
related to user input were added.

multi-project change with I159f5de2

this CL is the same as I618bcd07, which was reverted because of
incompatibilities with vendor branches.

Bug: 6188932
Change-Id: I999249dceb0c04f5a4ffbfff25caed09d24a2c52

1 files changed, 7 insertions, 18 deletions

diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index 2689e6e13..98da1eb65 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -555,6 +555,9 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
      * method on the base class if the subclass doesn't wish to handle the call.
      */
     protected boolean onLongPress(Key parentKey, PointerTracker tracker) {
+        if (ProductionFlag.IS_EXPERIMENTAL) {
+            ResearchLogger.latinKeyboardView_onLongPress();
+        }
         final int primaryCode = parentKey.mCode;
         if (parentKey.hasEmbeddedMoreKey()) {
             final int embeddedCode = KeySpecParser.getCode(getResources(), parentKey.mMoreKeys[0]);
@@ -695,17 +698,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
             }
         }
         if (ProductionFlag.IS_EXPERIMENTAL) {
-            if (ResearchLogger.sIsLogging) {
-                // TODO: remove redundant calculations of size and pressure by
-                // removing UsabilityStudyLog code once the ResearchLogger is mature enough
-                final float size = me.getSize(index);
-                final float pressure = me.getPressure(index);
-                if (action != MotionEvent.ACTION_MOVE) {
-                    // Skip ACTION_MOVE events as they are logged below
-                    ResearchLogger.getInstance().logMotionEvent(action, eventTime, id, x, y,
-                            size, pressure);
-                }
-            }
+            ResearchLogger.latinKeyboardView_processMotionEvent(me, action, eventTime, index, id,
+                    x, y);
         }
 
         if (mKeyTimerHandler.isInKeyRepeat()) {
@@ -773,13 +767,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
                             + pointerSize + "," + pointerPressure);
                 }
                 if (ProductionFlag.IS_EXPERIMENTAL) {
-                    if (ResearchLogger.sIsLogging) {
-                        // TODO: earlier comment about redundant calculations applies here too
-                        final float pointerSize = me.getSize(i);
-                        final float pointerPressure = me.getPressure(i);
-                        ResearchLogger.getInstance().logMotionEvent(action, eventTime, pointerId,
-                                px, py, pointerSize, pointerPressure);
-                    }
+                    ResearchLogger.latinKeyboardView_processMotionEvent(me, action, eventTime,
+                            i, pointerId, px, py);
                 }
             }
         } else {