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

am 4e5a4ddb: Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils" 

* commit '4e5a4ddbd06c3e98e931a789c13a9920fb3b4e16':
  [TestPrep1] Move MotionEvent.Action strings to LoggingUtils
main
Kurt Partridge 2013-02-21 14:15:34 -08:00 committed by Android Git Automerger
parent 099d3825ba 4e5a4ddbd0
commit be28c0c0b5
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
java/src/com/android/inputmethod/research/LoggingUtils.java Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.inputmethod.research;
import android.view.MotionEvent;
/* package */ class LoggingUtils {
private LoggingUtils() {
// This utility class is not publicly instantiable.
}
/* package */ static String getMotionEventActionTypeString(final int actionType) {
switch (actionType) {
case MotionEvent.ACTION_CANCEL: return "CANCEL";
case MotionEvent.ACTION_UP: return "UP";
case MotionEvent.ACTION_DOWN: return "DOWN";
case MotionEvent.ACTION_POINTER_UP: return "POINTER_UP";
case MotionEvent.ACTION_POINTER_DOWN: return "POINTER_DOWN";
case MotionEvent.ACTION_MOVE: return "MOVE";
case MotionEvent.ACTION_OUTSIDE: return "OUTSIDE";
default: return "ACTION_" + actionType;
}
}
}

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

@ -1226,17 +1226,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
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) {
final String actionString; final String actionString = LoggingUtils.getMotionEventActionTypeString(action);
switch (action) {
case MotionEvent.ACTION_CANCEL: actionString = "CANCEL"; break;
case MotionEvent.ACTION_UP: actionString = "UP"; break;
case MotionEvent.ACTION_DOWN: actionString = "DOWN"; break;
case MotionEvent.ACTION_POINTER_UP: actionString = "POINTER_UP"; break;
case MotionEvent.ACTION_POINTER_DOWN: actionString = "POINTER_DOWN"; break;
case MotionEvent.ACTION_MOVE: actionString = "MOVE"; break;
case MotionEvent.ACTION_OUTSIDE: actionString = "OUTSIDE"; break;
default: actionString = "ACTION_" + action; break;
}
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, false /* IS_LOGGING_RELATED */, MotionEvent.obtain(me)); actionString, false /* IS_LOGGING_RELATED */, MotionEvent.obtain(me));