aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/research
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-08-29 19:54:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-29 19:54:46 -0700
commit35d63bc79e8cabbaeef5da600846a35c1d6a2120 (patch)
tree6653f7a010ff8201cf72e6d06515a367b533da3d /java/src/com/android/inputmethod/research
parentb8846c817b309b04db7875781159a8c55581b3ea (diff)
parent0e30f8335270aca164aee96a9ab430d835c8ec63 (diff)
downloadlatinime-35d63bc79e8cabbaeef5da600846a35c1d6a2120.tar.gz
latinime-35d63bc79e8cabbaeef5da600846a35c1d6a2120.tar.xz
latinime-35d63bc79e8cabbaeef5da600846a35c1d6a2120.zip
am 0e30f833: am 29d5973f: Optimize rare Key attributes to separate class
* commit '0e30f8335270aca164aee96a9ab430d835c8ec63': Optimize rare Key attributes to separate class
Diffstat (limited to 'java/src/com/android/inputmethod/research')
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLog.java2
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLogger.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/research/ResearchLog.java b/java/src/com/android/inputmethod/research/ResearchLog.java
index 71a6d6a78..cd9ff85f8 100644
--- a/java/src/com/android/inputmethod/research/ResearchLog.java
+++ b/java/src/com/android/inputmethod/research/ResearchLog.java
@@ -257,7 +257,7 @@ public class ResearchLog {
for (Key keyboardKey : keyboardKeys) {
mJsonWriter.beginObject();
mJsonWriter.name("code").value(keyboardKey.mCode);
- mJsonWriter.name("altCode").value(keyboardKey.mAltCode);
+ mJsonWriter.name("altCode").value(keyboardKey.getAltCode());
mJsonWriter.name("x").value(keyboardKey.mX);
mJsonWriter.name("y").value(keyboardKey.mY);
mJsonWriter.name("w").value(keyboardKey.mWidth);
diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 918fcf5a1..9bb81a034 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -1045,7 +1045,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
final int y, final boolean ignoreModifierKey, final boolean altersCode,
final int code) {
if (key != null) {
- CharSequence outputText = key.mOutputText;
+ String outputText = key.getOutputText();
final Object[] values = {
Keyboard.printableCode(scrubDigitFromCodePoint(code)), outputText == null ? null
: scrubDigitsFromString(outputText.toString()),