Update OpenWnn to the latest (v134_091029)
Internal issue number: 1981647
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7f91d07..54e14cd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,9 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="jp.co.omronsoft.openwnn"
- android:versionCode="1"
- android:versionName="1.0">
+ package="jp.co.omronsoft.openwnn">
<uses-permission xmlns:android="http://schemas.android.com/apk/res/android" android:name="android.permission.VIBRATE"/>
<application android:label="OpenWnn">
diff --git a/README.txt b/README.txt
index 53a8d61..b729380 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
-------------------------------------------------------------------------------
OpenWnn Japnese README
- Version 1.3.3
+ Version 1.3.4
(C) Copyright OMRON SOFTWARE Co., Ltd. 2008,2009 All Rights Reserved.
-------------------------------------------------------------------------------
diff --git a/res/values-ja/string.xml b/res/values-ja/string.xml
index 7f1b283..66ece62 100644
--- a/res/values-ja/string.xml
+++ b/res/values-ja/string.xml
@@ -103,13 +103,13 @@
<!-- IME dependency -->
<!-- OpenWnn English -->
- <string name="openwnn_english_copyright">Ver.1.3.3\nオムロン ソフトウェア(株)</string>
+ <string name="openwnn_english_copyright">Ver.1.3.4\nオムロン ソフトウェア(株)</string>
<!-- OpenWnn Japanese -->
- <string name="openwnn_japanese_copyright">Ver.1.3.3\nオムロン ソフトウェア(株)</string>
+ <string name="openwnn_japanese_copyright">Ver.1.3.4\nオムロン ソフトウェア(株)</string>
<!-- OpenWnn Chinese -->
- <string name="openwnn_china_copyright">Ver.1.3.3\nオムロン ソフトウェア(株)</string>
+ <string name="openwnn_china_copyright">Ver.1.3.4\nオムロン ソフトウェア(株)</string>
<!-- Candidate Delete -->
<string name="button_candidate_select">選 択</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 48793b8..49748b4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -105,20 +105,20 @@
<!-- IME dependency -->
<!-- OpenWnn English -->
- <string name="openwnn_english_copyright">Ver.1.3.3\nOMRON SOFTWARE Co., Ltd.</string>
+ <string name="openwnn_english_copyright">Ver.1.3.4\nOMRON SOFTWARE Co., Ltd.</string>
<string name="openwnn_english">OpenWnn English</string>
<string name="openwnn_english_system_dictionary">/data/data/jp.co.omronsoft.openwnn/lib/libWnnEngDic.so</string>
<string name="openwnn_english_writable_dictionary">/data/data/jp.co.omronsoft.openwnn/writableEN.dic</string>
<string name="en_word_separators">.,;:!?</string>
<!-- OpenWnn Japanese -->
- <string name="openwnn_japanese_copyright">Ver.1.3.3\nOMRON SOFTWARE Co., Ltd.</string>
+ <string name="openwnn_japanese_copyright">Ver.1.3.4\nOMRON SOFTWARE Co., Ltd.</string>
<string name="openwnn_japanese">Japanese IME</string>
<string name="openwnn_japanese_system_dictionary">/data/data/jp.co.omronsoft.openwnn/lib/libWnnJpnDic.so</string>
<string name="openwnn_japanese_writable_dictionary">/data/data/jp.co.omronsoft.openwnn/writableJAJP.dic</string>
<!-- OpenWnn Chinese -->
- <string name="openwnn_china_copyright">Ver.1.3.3\nOMRON SOFTWARE Co., Ltd.</string>
+ <string name="openwnn_china_copyright">Ver.1.3.4\nOMRON SOFTWARE Co., Ltd.</string>
<string name="openwnn_china">OpenWnn Chinese</string>
<string name="openwnn_china_system_dictionary">/data/data/jp.co.omronsoft.openwnn/lib/libWnnZHCNDic.so</string>
<!-- After Config Change -->
diff --git a/src/jp/co/omronsoft/openwnn/DefaultSoftKeyboard.java b/src/jp/co/omronsoft/openwnn/DefaultSoftKeyboard.java
index 0fa7e31..edb308c 100644
--- a/src/jp/co/omronsoft/openwnn/DefaultSoftKeyboard.java
+++ b/src/jp/co/omronsoft/openwnn/DefaultSoftKeyboard.java
@@ -538,10 +538,9 @@
mMainView = (ViewGroup) parent.getLayoutInflater().inflate(R.layout.keyboard_default_main, null);
mSubView = (ViewGroup) parent.getLayoutInflater().inflate(R.layout.keyboard_default_sub, null);
- if (mDisplayMode == LANDSCAPE && !mHardKeyboardHidden) {
+ if (mDisplayMode == LANDSCAPE || !mHardKeyboardHidden) {
mMainView.addView(mSubView);
- }
- if (mKeyboardView != null) {
+ } else if (mKeyboardView != null) {
mMainView.addView(mKeyboardView);
}
diff --git a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java
index 1348e5d..9a023e5 100644
--- a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java
+++ b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java
@@ -391,7 +391,7 @@
private boolean inputDataCheck(View v) {
/* return false if the length of the string exceeds the limit. */
- if ((((TextView)v).getTextSize()) > MAX_TEXT_SIZE) {
+ if ((((TextView)v).getText().length()) > MAX_TEXT_SIZE) {
showDialog(DIALOG_CONTROL_OVER_MAX_TEXT_SIZE);
Log.e("OpenWnn", "inputDataCheck() : over max string length.");
return false;
