commit 3b0f2bf169c23ea94c5a0adb275ce41b5c34ea83
author Tadashi G. Takaoka <takaoka@google.com> Mon Jan 30 00:11:29 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 30 00:11:29 2012 -0800
tree 6abef72966ef5fe0fc6b31e2b1cc6433a0087d99
parent 6029b43a3df1fa9a9baa339e2dbb984c6669d214
parent 15c99e9f1a7776b95325d36cf9e38b6d674e483b

Merge "Support addtionalMoreKeys"

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

diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index aee356a..7e8a718 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -639,7 +639,8 @@
             }
             if (!TextUtils.isEmpty(eventTag)) {
                 UsabilityStudyLogUtils.getInstance().write(
-                        eventTag + eventTime + "," + id + "," + x + "," + y + "\t\t");
+                        eventTag + eventTime + "," + id + "," + x + "," + y + ","
+                        + me.getSize(index) + "," + me.getPressure(index));
             }
         }
 
@@ -701,7 +702,8 @@
                 tracker.onMoveEvent(px, py, eventTime);
                 if (ENABLE_USABILITY_STUDY_LOG) {
                     UsabilityStudyLogUtils.getInstance().write("[Move]"  + eventTime + ","
-                            + me.getPointerId(i) + "," + px + "," + py + "\t\t");
+                            + me.getPointerId(i) + "," + px + "," + py + ","
+                            + me.getSize(i) + "," + me.getPressure(i));
                 }
             }
         } else {

java/src/com/android/inputmethod/latin/Utils.java

diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index bc8a130..a708087 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -369,7 +369,7 @@
 
         private UsabilityStudyLogUtils() {
             mDate = new Date();
-            mDateFormat = new SimpleDateFormat("dd MMM HH:mm:ss.SSS");
+            mDateFormat = new SimpleDateFormat("yyyyMMdd-HHmmss.SSSZ");
 
             HandlerThread handlerThread = new HandlerThread("UsabilityStudyLogUtils logging task",
                     Process.THREAD_PRIORITY_BACKGROUND);