nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 0cafd658: Merge "[Rlog48a] Update and make logging strings consistent" 

# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '0cafd6580c05de2b718652cdced8e7072efa3a21':
  [Rlog48a] Update and make logging strings consistent
main
Kurt Partridge 2013-02-01 08:35:42 -08:00 committed by Android Git Automerger
parent f8dd2f4ebd 0cafd6580c
commit 59abd14ad9
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/research/LogStatement.java
View File

@ -29,13 +29,12 @@ class LogStatement {
"PointerTrackerCallListenerOnCodeInput"; "PointerTrackerCallListenerOnCodeInput";
public static final String KEY_CODE = "code"; public static final String KEY_CODE = "code";
public static final String VALUE_RESEARCH = "research"; public static final String VALUE_RESEARCH = "research";
public static final String TYPE_LATIN_KEYBOARD_VIEW_ON_LONG_PRESS = public static final String TYPE_MAIN_KEYBOARD_VIEW_ON_LONG_PRESS =
"LatinKeyboardViewOnLongPress"; "MainKeyboardViewOnLongPress";
public static final String ACTION = "action"; public static final String ACTION = "action";
public static final String VALUE_DOWN = "DOWN"; public static final String VALUE_DOWN = "DOWN";
public static final String TYPE_LATIN_KEYBOARD_VIEW_PROCESS_MOTION_EVENTS = public static final String TYPE_MOTION_EVENT = "MotionEvent";
"LatinKeyboardViewProcessMotionEvents"; public static final String KEY_IS_LOGGING_RELATED = "isLoggingRelated";
public static final String KEY_LOGGING_RELATED = "loggingRelated";
// Name specifying the LogStatement type. // Name specifying the LogStatement type.
private final String mType; private final String mType;

9
java/src/com/android/inputmethod/research/LogUnit.java
View File

@ -453,13 +453,12 @@ import java.util.List;
// Look for the long press that started the invocation of the research key code input. // Look for the long press that started the invocation of the research key code input.
final int indexOfLastLongPressBeforeResearchKey = final int indexOfLastLongPressBeforeResearchKey =
findLastIndexBefore(LogStatement.TYPE_LATIN_KEYBOARD_VIEW_ON_LONG_PRESS, findLastIndexBefore(LogStatement.TYPE_MAIN_KEYBOARD_VIEW_ON_LONG_PRESS,
indexOfLastResearchKey); indexOfLastResearchKey);
// Look for DOWN event preceding the long press // Look for DOWN event preceding the long press
final int indexOfLastDownEventBeforeLongPress = final int indexOfLastDownEventBeforeLongPress =
findLastIndexContainingKeyValueBefore( findLastIndexContainingKeyValueBefore(LogStatement.TYPE_MOTION_EVENT,
LogStatement.TYPE_LATIN_KEYBOARD_VIEW_PROCESS_MOTION_EVENTS,
LogStatement.ACTION, LogStatement.VALUE_DOWN, LogStatement.ACTION, LogStatement.VALUE_DOWN,
indexOfLastLongPressBeforeResearchKey); indexOfLastLongPressBeforeResearchKey);
@ -471,8 +470,8 @@ import java.util.List;
final LogStatement logStatement = mLogStatementList.get(index); final LogStatement logStatement = mLogStatementList.get(index);
final String type = logStatement.getType(); final String type = logStatement.getType();
final Object[] values = mValuesList.get(index); final Object[] values = mValuesList.get(index);
if (type.equals(LogStatement.TYPE_LATIN_KEYBOARD_VIEW_PROCESS_MOTION_EVENTS)) { if (type.equals(LogStatement.TYPE_MOTION_EVENT)) {
logStatement.setValue(LogStatement.KEY_LOGGING_RELATED, values, true); logStatement.setValue(LogStatement.KEY_IS_LOGGING_RELATED, values, true);
} }
} }
return true; return true;

2
java/src/com/android/inputmethod/research/MotionEventReader.java
View File

@ -101,7 +101,7 @@ public class MotionEventReader {
jsonReader.endObject(); jsonReader.endObject();
if (logStatementType != null && time != null && x != null && y != null && actionType != null if (logStatementType != null && time != null && x != null && y != null && actionType != null
&& logStatementType.equals("MainKeyboardViewProcessMotionEvent") && logStatementType.equals("MotionEvent")
&& !loggingRelated) { && !loggingRelated) {
replayData.mActions.add(actionType); replayData.mActions.add(actionType);
replayData.mXCoords.add(x); replayData.mXCoords.add(x);

5
java/src/com/android/inputmethod/research/ResearchLogger.java
View File

@ -1162,7 +1162,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
* *
*/ */
private static final LogStatement LOGSTATEMENT_MAIN_KEYBOARD_VIEW_PROCESS_MOTION_EVENT = private static final LogStatement LOGSTATEMENT_MAIN_KEYBOARD_VIEW_PROCESS_MOTION_EVENT =
new LogStatement("MotionEvent", true, false, "action", "MotionEvent", "loggingRelated"); new LogStatement("MotionEvent", true, false, "action",
LogStatement.KEY_IS_LOGGING_RELATED, "motionEvent");
public static void mainKeyboardView_processMotionEvent(final MotionEvent me, final int action, public static void mainKeyboardView_processMotionEvent(final MotionEvent me, final int action,
final long eventTime, final int index, final int id, final int x, final int y) { final long eventTime, final int index, final int id, final int x, final int y) {
if (me != null) { if (me != null) {
@ -1179,7 +1180,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
} }
final ResearchLogger researchLogger = getInstance(); final ResearchLogger researchLogger = getInstance();
researchLogger.enqueueEvent(LOGSTATEMENT_MAIN_KEYBOARD_VIEW_PROCESS_MOTION_EVENT, researchLogger.enqueueEvent(LOGSTATEMENT_MAIN_KEYBOARD_VIEW_PROCESS_MOTION_EVENT,
actionString, MotionEvent.obtain(me), false); actionString, false /* IS_LOGGING_RELATED */, MotionEvent.obtain(me));
if (action == MotionEvent.ACTION_DOWN) { if (action == MotionEvent.ACTION_DOWN) {
// Subtract 1 from eventTime so the down event is included in the later // Subtract 1 from eventTime so the down event is included in the later
// LogUnit, not the earlier (the test is for inequality). // LogUnit, not the earlier (the test is for inequality).