Merge commit 'goog/master'
Conflicts:
native/Android.mk
diff --git a/java/Android.mk b/java/Android.mk
index 4bb8986..97c906f 100755
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -5,15 +5,18 @@
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_PACKAGE_NAME := LatinIME
+LOCAL_PACKAGE_NAME := LatinIme2Google
LOCAL_CERTIFICATE := shared
-LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
+LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2
LOCAL_STATIC_JAVA_LIBRARIES := android-common
#LOCAL_AAPT_FLAGS := -0 .dict
+# The following flag is required because we use a different package name
+# com.google.android.inputmethod.latin2 in the LatinIME sandbox.
+LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin
LOCAL_SDK_VERSION := current
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index e229bc7..d33016a 100755
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.inputmethod.latin">
+ package="com.google.android.inputmethod.latin2">
- <original-package android:name="com.android.inputmethod.latin" />
+ <!-- Do not override the default LatinIME for now -->
+ <!-- original-package android:name="com.android.inputmethod.latin" / -->
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
@@ -10,10 +11,10 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
<application android:label="@string/english_ime_name"
- android:backupAgent="LatinIMEBackupAgent"
+ android:backupAgent="com.android.inputmethod.latin.LatinIMEBackupAgent"
android:killAfterRestore="false">
- <service android:name="LatinIME"
+ <service android:name="com.android.inputmethod.latin.LatinIME"
android:label="@string/english_ime_name"
android:permission="android.permission.BIND_INPUT_METHOD">
<intent-filter>
@@ -22,13 +23,13 @@
<meta-data android:name="android.view.im" android:resource="@xml/method" />
</service>
- <activity android:name="LatinIMESettings" android:label="@string/english_ime_settings">
+ <activity android:name="com.android.inputmethod.latin.LatinIMESettings" android:label="@string/english_ime_settings">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <activity android:name="InputLanguageSelection"
+ <activity android:name="com.android.inputmethod.latin.InputLanguageSelection"
android:label="@string/language_selection_title">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 7867684..f77cb21 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="english_ime_name" msgid="7252517407088836577">"Androidキーボード"</string>
- <string name="english_ime_settings" msgid="6661589557206947774">"Androidキーボードの設定"</string>
+ <string name="english_ime_name" msgid="7252517407088836577">"Androidキーボード 2"</string>
+ <string name="english_ime_settings" msgid="6661589557206947774">"Androidキーボード 2 の設定"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"キー操作バイブ"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"キー操作音"</string>
<string name="hit_correction" msgid="4855351009261318389">"入力ミス補正"</string>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index 9c9b257..b0a0781 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="english_ime_name" msgid="7252517407088836577">"Android 键盘"</string>
- <string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘设置"</string>
+ <string name="english_ime_name" msgid="7252517407088836577">"Android 键盘 2"</string>
+ <string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘 2 设置"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"按键时振动"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"按键时播放音效"</string>
<string name="hit_correction" msgid="4855351009261318389">"纠正输入错误"</string>
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 4f83be4..89b2eac 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="english_ime_name" msgid="7252517407088836577">"Android 鍵盤"</string>
- <string name="english_ime_settings" msgid="6661589557206947774">"Android 鍵盤設定"</string>
+ <string name="english_ime_name" msgid="7252517407088836577">"Android 鍵盤 2"</string>
+ <string name="english_ime_settings" msgid="6661589557206947774">"Android 鍵盤 2 設定"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"按鍵時震動"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"按鍵時播放音效"</string>
<string name="hit_correction" msgid="4855351009261318389">"修正輸入錯誤"</string>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 35dd3e0..f1af31c 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -19,9 +19,9 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Title for Latin keyboard -->
- <string name="english_ime_name">Android keyboard</string>
+ <string name="english_ime_name">Android keyboard 2</string>
<!-- Title for Latin keyboard settings activity / dialog -->
- <string name="english_ime_settings">Android keyboard settings</string>
+ <string name="english_ime_settings">Android keyboard 2 settings</string>
<!-- Option to provide vibrate/haptic feedback on keypress -->
<string name="vibrate_on_keypress">Vibrate on keypress</string>
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 4901b21..dc5417e 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -51,9 +51,9 @@
static {
try {
- System.loadLibrary("jni_latinime");
+ System.loadLibrary("jni_latinime2");
} catch (UnsatisfiedLinkError ule) {
- Log.e("BinaryDictionary", "Could not load native library jni_latinime");
+ Log.e("BinaryDictionary", "Could not load native library jni_latinime2");
}
}
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index b4ed80c..1586a75 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -309,6 +309,7 @@
});
}
prefs.registerOnSharedPreferenceChangeListener(this);
+ LatinImeLogger.init(this);
}
private void initSuggest(String locale) {
@@ -354,6 +355,7 @@
if (VOICE_INSTALLED) {
mVoiceInput.destroy();
}
+ LatinImeLogger.commit();
super.onDestroy();
}
@@ -937,6 +939,7 @@
case Keyboard.KEYCODE_DELETE:
handleBackspace();
mDeleteCount++;
+ LatinImeLogger.logOnDelete(1);
break;
case Keyboard.KEYCODE_SHIFT:
handleShift();
@@ -982,6 +985,7 @@
} else {
handleCharacter(primaryCode, keyCodes);
}
+ LatinImeLogger.logOnInputChar(1);
// Cancel the just reverted state
mJustRevertedSeparator = null;
}
diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
new file mode 100644
index 0000000..a04e1cf
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2010 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.latin;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.DropBoxManager;
+import android.preference.PreferenceManager;
+import android.text.format.DateUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChangeListener {
+ private static final String TAG = "LatinIMELogs";
+ private static final boolean DBG = false;
+ // DEFAULT_LOG_ENABLED should be false when released to public.
+ private static final boolean DEFAULT_LOG_ENABLED = true;
+
+ private static final long MINIMUMSENDINTERVAL = 60 * DateUtils.SECOND_IN_MILLIS; // 60 sec
+ private static final long MINIMUMCOUNTINTERVAL = 20 * DateUtils.SECOND_IN_MILLIS; // 20 sec
+ private static final char SEPARATER = ';';
+ private static final int ID_CLICKSUGGESTION = 0;
+ private static final int ID_AUTOSUGGESTION = 1;
+ private static final int ID_AUTOSUGGESTIONCANCELED = 2;
+ private static final int ID_INPUT_COUNT = 3;
+ private static final int ID_DELETE_COUNT = 4;
+ private static final int ID_WORD_COUNT = 5;
+
+ private static final String PREF_ENABLE_LOG = "enable_log";
+
+ private static LatinImeLogger sLatinImeLogger = new LatinImeLogger();
+ public static boolean sLogEnabled = true;
+
+ private ArrayList<LogEntry> mLogBuffer = null;
+ private ArrayList<LogEntry> mPrivacyLogBuffer = null;
+ private Context mContext = null;
+ private DropBoxManager mDropBox = null;
+ private long mLastTimeActive;
+ private long mLastTimeSend;
+ private long mLastTimeCountEntry;
+
+ private int mDeleteCount;
+ private int mInputCount;
+ private int mWordCount;
+
+ private static class LogEntry implements Comparable<LogEntry> {
+ public final int mTag;
+ public final String[] mData;
+ public long mTime;
+
+ public LogEntry (long time, int tag, String[] data) {
+ mTag = tag;
+ mTime = time;
+ mData = data;
+ }
+
+ public int compareTo(LogEntry log2) {
+ if (mData.length == 0 && log2.mData.length == 0) {
+ return 0;
+ } else if (mData.length == 0) {
+ return 1;
+ } else if (log2.mData.length == 0) {
+ return -1;
+ }
+ return log2.mData[0].compareTo(mData[0]);
+ }
+ }
+
+ private void initInternal(Context context) {
+ mContext = context;
+ mDropBox = (DropBoxManager) mContext.getSystemService(Context.DROPBOX_SERVICE);
+ mLastTimeSend = System.currentTimeMillis();
+ mLastTimeActive = mLastTimeSend;
+ mLastTimeCountEntry = mLastTimeSend;
+ mDeleteCount = 0;
+ mInputCount = 0;
+ mLogBuffer = new ArrayList<LogEntry>();
+ final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+ sLogEnabled = prefs.getBoolean(PREF_ENABLE_LOG, DEFAULT_LOG_ENABLED);
+ prefs.registerOnSharedPreferenceChangeListener(this);
+ }
+
+ /**
+ * Clear all logged data
+ */
+ private void reset() {
+ mDeleteCount = 0;
+ mInputCount = 0;
+ mLogBuffer.clear();
+ }
+
+ /**
+ * Check if the input string is safe as an entry or not.
+ */
+ private static boolean checkStringDataSafe(String s) {
+ for (int i = 0; i < s.length(); ++i) {
+ if (!Character.isDigit(s.charAt(i))) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean checkStringsDataSafe(String[] strings) {
+ for(String s: strings) {
+ if (!checkStringDataSafe(s)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private void addCountEntry(long time) {
+ mLogBuffer.add(
+ new LogEntry (time, ID_DELETE_COUNT,
+ new String[] {String.valueOf(mDeleteCount)}));
+ mLogBuffer.add(new LogEntry (time, ID_INPUT_COUNT,
+ new String[] {String.valueOf(mInputCount)}));
+ mLogBuffer.add(new LogEntry (time, ID_WORD_COUNT,
+ new String[] {String.valueOf(mWordCount)}));
+ mDeleteCount = 0;
+ mInputCount = 0;
+ mWordCount = 0;
+ }
+
+ private void flushPrivacyLogSafely() {
+ long now = System.currentTimeMillis();
+ Collections.sort(mPrivacyLogBuffer);
+ for (LogEntry l: mPrivacyLogBuffer) {
+ l.mTime = now;
+ mLogBuffer.add(l);
+ }
+ mPrivacyLogBuffer.clear();
+ }
+
+ /**
+ * Add an entry
+ * @param tag
+ * @param data
+ */
+ private void addData(int tag, Object data) {
+ switch (tag) {
+ case ID_DELETE_COUNT:
+ if (mLastTimeActive - mLastTimeCountEntry > MINIMUMCOUNTINTERVAL
+ || (mDeleteCount == 0 && mInputCount == 0)) {
+ addCountEntry(mLastTimeActive);
+ }
+ mDeleteCount += (Integer)data;
+ break;
+ case ID_INPUT_COUNT:
+ if (mLastTimeActive - mLastTimeCountEntry > MINIMUMCOUNTINTERVAL
+ || (mDeleteCount == 0 && mInputCount == 0)) {
+ addCountEntry(mLastTimeActive);
+ }
+ mInputCount += (Integer)data;
+ break;
+ case ID_CLICKSUGGESTION:
+ case ID_AUTOSUGGESTION:
+ ++mWordCount;
+ String[] dataStrings = (String[]) data;
+ if (checkStringsDataSafe(dataStrings)) {
+ mPrivacyLogBuffer.add(
+ new LogEntry (System.currentTimeMillis(), tag, dataStrings));
+ } else {
+ if (DBG) {
+ Log.d(TAG, "Skipped to add an entry because data is unsafe.");
+ }
+ }
+ break;
+ case ID_AUTOSUGGESTIONCANCELED:
+ --mWordCount;
+ dataStrings = (String[]) data;
+ if (checkStringsDataSafe(dataStrings)) {
+ mPrivacyLogBuffer.add(
+ new LogEntry (System.currentTimeMillis(), tag, dataStrings));
+ } else {
+ if (DBG) {
+ Log.d(TAG, "Skipped to add an entry because data is unsafe.");
+ }
+ }
+ break;
+ default:
+ if (DBG) {
+ Log.e(TAG, "Log Tag is not entried.");
+ }
+ break;
+ }
+ }
+
+ private void commitInternal() {
+ flushPrivacyLogSafely();
+ addCountEntry(System.currentTimeMillis());
+ String s = LogSerializer.createStringFromEntries(mLogBuffer);
+ if (DBG) {
+ Log.d(TAG, "Commit log: " + s);
+ }
+ mDropBox.addText(TAG, s);
+ reset();
+ mLastTimeSend = System.currentTimeMillis();
+ }
+
+ private void sendLogToDropBox(int tag, Object s) {
+ long now = System.currentTimeMillis();
+ if (DBG) {
+ Log.d(TAG, "SendLog: " + tag + ";" + s + ","
+ + (now - mLastTimeSend - MINIMUMSENDINTERVAL) );
+ }
+ if (now - mLastTimeActive > MINIMUMSENDINTERVAL) {
+ // Send a log before adding an log entry if the last data is too old.
+ commitInternal();
+ addData(tag, s);
+ } else if (now - mLastTimeSend > MINIMUMSENDINTERVAL) {
+ // Send a log after adding an log entry.
+ addData(tag, s);
+ commitInternal();
+ } else {
+ addData(tag, s);
+ }
+ mLastTimeActive = now;
+ }
+
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ if (PREF_ENABLE_LOG.equals(key)) {
+ if (sharedPreferences.getBoolean(key, DEFAULT_LOG_ENABLED)) {
+ sLogEnabled = (mContext != null);
+ } else {
+ sLogEnabled = false;
+ }
+ }
+ }
+
+ public static void init(Context context) {
+ sLatinImeLogger.initInternal(context);
+ }
+
+ public static void commit() {
+ if (sLogEnabled) {
+ sLatinImeLogger.commitInternal();
+ }
+ }
+
+ public static void logOnClickSuggestion(String before, String after, int position) {
+ if (sLogEnabled) {
+ String[] strings = new String[] {before, after, String.valueOf(position)};
+ sLatinImeLogger.sendLogToDropBox(ID_CLICKSUGGESTION, strings);
+ }
+ }
+
+ public static void logOnAutoSuggestion(String before, String after) {
+ if (sLogEnabled) {
+ String[] strings = new String[] {before, after};
+ sLatinImeLogger.sendLogToDropBox(ID_AUTOSUGGESTION, strings);
+ }
+ }
+
+ public static void logOnAutoSuggestionCanceled(String before, String after) {
+ if (sLogEnabled) {
+ String[] strings = new String[] {before, after};
+ sLatinImeLogger.sendLogToDropBox(ID_AUTOSUGGESTIONCANCELED, strings);
+ }
+ }
+
+ public static void logOnDelete(int length) {
+ if (sLogEnabled) {
+ sLatinImeLogger.sendLogToDropBox(ID_DELETE_COUNT, length);
+ }
+ }
+
+ public static void logOnInputChar(int length) {
+ if (sLogEnabled) {
+ sLatinImeLogger.sendLogToDropBox(ID_INPUT_COUNT, length);
+ }
+ }
+
+ private static class LogSerializer {
+ private static void appendWithLength(StringBuffer sb, String data) {
+ sb.append(data.length());
+ sb.append(SEPARATER);
+ sb.append(data);
+ sb.append(SEPARATER);
+ }
+
+ private static void appendLogEntry(StringBuffer sb, String time, String tag, String[] data) {
+ if (data.length > 0) {
+ appendWithLength(sb, String.valueOf(data.length + 2));
+ appendWithLength(sb, time);
+ appendWithLength(sb, tag);
+ for (String s: data) {
+ appendWithLength(sb, s);
+ }
+ }
+ }
+
+ public static String createStringFromEntries(ArrayList<LogEntry> logs) {
+ StringBuffer sb = new StringBuffer();
+ for (LogEntry log: logs) {
+ appendLogEntry(sb, String.valueOf(log.mTime), String.valueOf(log.mTag), log.mData);
+ }
+ return sb.toString();
+ }
+ }
+}
diff --git a/native/Android.mk b/native/Android.mk
index 0df74c7..5755109 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -11,8 +11,10 @@
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE)
-LOCAL_MODULE := libjni_latinime
+LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE := libjni_latinime2
+
+LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)