Revert "add more data collection points to ResearchLogger" (d16bda4a) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java

+18 −7

Original line number	Diff line number	Diff line
		@@ -555,9 +555,6 @@ 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]);
		@@ -698,8 +695,17 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
		}
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.latinKeyboardView_processMotionEvent(me, action, eventTime, index, id,
		x, y);
		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);
		}
		}
		}

		if (mKeyTimerHandler.isInKeyRepeat()) {
		@@ -767,8 +773,13 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
		+ pointerSize + "," + pointerPressure);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.latinKeyboardView_processMotionEvent(me, action, eventTime,
		i, pointerId, px, py);
		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);
		}
		}
		}
		} else {

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@ import android.widget.TextView;

		import com.android.inputmethod.keyboard.internal.PointerTrackerQueue;
		import com.android.inputmethod.latin.LatinImeLogger;
		import com.android.inputmethod.latin.ResearchLogger;
		import com.android.inputmethod.latin.define.ProductionFlag;

		import java.util.ArrayList;

		@@ -237,10 +235,6 @@ public class PointerTracker {
		+ " ignoreModifier=" + ignoreModifierKey
		+ " enabled=" + key.isEnabled());
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.pointerTracker_callListenerOnPressAndCheckKeyboardLayoutChange(key,
		ignoreModifierKey);
		}
		if (ignoreModifierKey) {
		return false;
		}
		@@ -265,10 +259,6 @@ public class PointerTracker {
		+ " ignoreModifier=" + ignoreModifierKey + " altersCode=" + altersCode
		+ " enabled=" + key.isEnabled());
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.pointerTracker_callListenerOnCodeInput(key, x, y, ignoreModifierKey,
		altersCode, code);
		}
		if (ignoreModifierKey) {
		return;
		}
		@@ -294,10 +284,6 @@ public class PointerTracker {
		+ " sliding=" + withSliding + " ignoreModifier=" + ignoreModifierKey
		+ " enabled="+ key.isEnabled());
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.pointerTracker_callListenerOnRelease(key, primaryCode, withSliding,
		ignoreModifierKey);
		}
		if (ignoreModifierKey) {
		return;
		}
		@@ -309,9 +295,6 @@ public class PointerTracker {
		private void callListenerOnCancelInput() {
		if (DEBUG_LISTENER)
		Log.d(TAG, "onCancelInput");
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.pointerTracker_callListenerOnCancelInput();
		}
		mListener.onCancelInput();
		}

		@@ -496,9 +479,6 @@ public class PointerTracker {
		if (DEBUG_MODE)
		Log.w(TAG, "onDownEvent: ignore potential noise: time=" + deltaT
		+ " distance=" + distanceSquared);
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.pointerTracker_onDownEvent(deltaT, distanceSquared);
		}
		mKeyAlreadyProcessed = true;
		return;
		}
		@@ -603,9 +583,6 @@ public class PointerTracker {
		if (DEBUG_MODE)
		Log.w(TAG, String.format("onMoveEvent: sudden move is translated to "
		+ "up[%d,%d]/down[%d,%d] events", lastX, lastY, x, y));
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.pointerTracker_onMoveEvent(x, y, lastX, lastY);
		}
		onUpEventInternal(lastX, lastY, eventTime);
		onDownEventInternal(x, y, eventTime);
		} else {

java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -22,9 +22,7 @@ import android.view.MotionEvent;

		import com.android.inputmethod.latin.LatinImeLogger;
		import com.android.inputmethod.latin.R;
		import com.android.inputmethod.latin.ResearchLogger;
		import com.android.inputmethod.latin.Utils;
		import com.android.inputmethod.latin.define.ProductionFlag;

		public class SuddenJumpingTouchEventHandler {
		private static final String TAG = SuddenJumpingTouchEventHandler.class.getSimpleName();
		@@ -143,9 +141,6 @@ public class SuddenJumpingTouchEventHandler {
		if (handleSuddenJumping(me)) {
		if (DEBUG_MODE)
		Log.w(TAG, "onTouchEvent: ignore sudden jump " + me);
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.suddenJumpingTouchEventHandler_onTouchEvent(me);
		}
		return true;
		}
		return mView.processMotionEvent(me);

java/src/com/android/inputmethod/keyboard/internal/AlphabetShiftState.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -18,9 +18,6 @@ package com.android.inputmethod.keyboard.internal;

		import android.util.Log;

		import com.android.inputmethod.latin.ResearchLogger;
		import com.android.inputmethod.latin.define.ProductionFlag;

		public class AlphabetShiftState {
		private static final String TAG = AlphabetShiftState.class.getSimpleName();
		private static final boolean DEBUG = false;
		@@ -62,9 +59,6 @@ public class AlphabetShiftState {
		}
		if (DEBUG)
		Log.d(TAG, "setShifted(" + newShiftState + "): " + toString(oldState) + " > " + this);
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.alphabetShiftState_setShifted(newShiftState, oldState, this);
		}
		}

		public void setShiftLocked(boolean newShiftLockState) {
		@@ -84,9 +78,6 @@ public class AlphabetShiftState {
		if (DEBUG)
		Log.d(TAG, "setShiftLocked(" + newShiftLockState + "): " + toString(oldState)
		+ " > " + this);
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.alphabetShiftState_setShiftLocked(newShiftLockState, oldState, this);
		}
		}

		public void setAutomaticShifted() {
		@@ -94,9 +85,6 @@ public class AlphabetShiftState {
		mState = AUTOMATIC_SHIFTED;
		if (DEBUG)
		Log.d(TAG, "setAutomaticShifted: " + toString(oldState) + " > " + this);
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.alphabetShiftState_setAutomaticShifted(oldState, this);
		}
		}

		public boolean isShiftedOrShiftLocked() {

java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java

+0 −45

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ import android.text.TextUtils;
		import android.util.Log;

		import com.android.inputmethod.keyboard.Keyboard;
		import com.android.inputmethod.latin.ResearchLogger;
		import com.android.inputmethod.latin.define.ProductionFlag;

		/**
		* Keyboard state machine.
		@@ -141,9 +139,6 @@ public class KeyboardState {
		if (DEBUG_EVENT) {
		Log.d(TAG, "onSaveKeyboardState: saved=" + state + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onSaveKeyboardState(this, state.toString());
		}
		}

		private void onRestoreKeyboardState() {
		@@ -151,9 +146,6 @@ public class KeyboardState {
		if (DEBUG_EVENT) {
		Log.d(TAG, "onRestoreKeyboardState: saved=" + state + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onRestoreKeyboardState(this, state.toString());
		}
		if (!state.mIsValid \|\| state.mIsAlphabetMode) {
		setAlphabetKeyboard();
		} else {
		@@ -186,9 +178,6 @@ public class KeyboardState {
		if (DEBUG_ACTION) {
		Log.d(TAG, "setShifted: shiftMode=" + shiftModeToString(shiftMode) + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_setShifted(this, shiftModeToString(shiftMode));
		}
		if (!mIsAlphabetMode) return;
		final int prevShiftMode;
		if (mAlphabetShiftState.isAutomaticShifted()) {
		@@ -228,9 +217,6 @@ public class KeyboardState {
		if (DEBUG_ACTION) {
		Log.d(TAG, "setShiftLocked: shiftLocked=" + shiftLocked + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_setShiftLocked(this, shiftLocked);
		}
		if (!mIsAlphabetMode) return;
		if (shiftLocked && (!mAlphabetShiftState.isShiftLocked()
		\|\| mAlphabetShiftState.isShiftLockShifted())) {
		@@ -246,9 +232,6 @@ public class KeyboardState {
		if (DEBUG_ACTION) {
		Log.d(TAG, "toggleAlphabetAndSymbols: " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_toggleAlphabetAndSymbols(this);
		}
		if (mIsAlphabetMode) {
		mPrevMainKeyboardWasShiftLocked = mAlphabetShiftState.isShiftLocked();
		if (mPrevSymbolsKeyboardWasShifted) {
		@@ -279,10 +262,6 @@ public class KeyboardState {
		if (DEBUG_ACTION) {
		Log.d(TAG, "setAlphabetKeyboard");
		}

		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_setAlphabetKeyboard();
		}
		mSwitchActions.setAlphabetKeyboard();
		mIsAlphabetMode = true;
		mIsSymbolShifted = false;
		@@ -294,9 +273,6 @@ public class KeyboardState {
		if (DEBUG_ACTION) {
		Log.d(TAG, "setSymbolsKeyboard");
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_setSymbolsKeyboard();
		}
		mSwitchActions.setSymbolsKeyboard();
		mIsAlphabetMode = false;
		mIsSymbolShifted = false;
		@@ -309,9 +285,6 @@ public class KeyboardState {
		if (DEBUG_ACTION) {
		Log.d(TAG, "setSymbolsShiftedKeyboard");
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_setSymbolsShiftedKeyboard();
		}
		mSwitchActions.setSymbolsShiftedKeyboard();
		mIsAlphabetMode = false;
		mIsSymbolShifted = true;
		@@ -324,9 +297,6 @@ public class KeyboardState {
		if (DEBUG_EVENT) {
		Log.d(TAG, "onPressKey: code=" + Keyboard.printableCode(code) + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onPressKey(code, this);
		}
		if (code == Keyboard.CODE_SHIFT) {
		onPressShift();
		} else if (code == Keyboard.CODE_SWITCH_ALPHA_SYMBOL) {
		@@ -344,9 +314,6 @@ public class KeyboardState {
		Log.d(TAG, "onReleaseKey: code=" + Keyboard.printableCode(code)
		+ " sliding=" + withSliding + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onReleaseKey(this, code, withSliding);
		}
		if (code == Keyboard.CODE_SHIFT) {
		onReleaseShift(withSliding);
		} else if (code == Keyboard.CODE_SWITCH_ALPHA_SYMBOL) {
		@@ -378,9 +345,6 @@ public class KeyboardState {
		if (DEBUG_EVENT) {
		Log.d(TAG, "onLongPressTimeout: code=" + Keyboard.printableCode(code) + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onLongPressTimeout(code, this);
		}
		if (mIsAlphabetMode && code == Keyboard.CODE_SHIFT) {
		if (mAlphabetShiftState.isShiftLocked()) {
		setShiftLocked(false);
		@@ -399,9 +363,6 @@ public class KeyboardState {
		if (DEBUG_EVENT) {
		Log.d(TAG, "onUpdateShiftState: autoCaps=" + autoCaps + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onUpdateShiftState(this, autoCaps);
		}
		updateAlphabetShiftState(autoCaps);
		}

		@@ -520,9 +481,6 @@ public class KeyboardState {
		if (DEBUG_EVENT) {
		Log.d(TAG, "onCancelInput: single=" + isSinglePointer + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onCancelInput(isSinglePointer, this);
		}
		// Switch back to the previous keyboard mode if the user cancels sliding input.
		if (isSinglePointer) {
		if (mSwitchState == SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL) {
		@@ -554,9 +512,6 @@ public class KeyboardState {
		+ " single=" + isSinglePointer
		+ " autoCaps=" + autoCaps + " " + this);
		}
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.keyboardState_onCodeInput(code, isSinglePointer, autoCaps, this);
		}

		switch (mSwitchState) {
		case SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL: