ハードキーボード関連の修正（未検証）これでいきなりLandscapeでも動くの

では？

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2033839..176eabd 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.hiroshica.android.input.nicownn2"
-         android:versionCode="11" android:versionName="1.0.11">
+         android:versionCode="12" android:versionName="1.0.12">
   <uses-permission xmlns:android="http://schemas.android.com/apk/res/android" android:name="android.permission.VIBRATE"/>
     <application android:icon="@drawable/icon" android:label="NicoWnn">
 

diff --git a/res/values-ja/string.xml b/res/values-ja/string.xml
index 3ce33e4..d03a1c0 100644 (file)
--- a/res/values-ja/string.xml
+++ b/res/values-ja/string.xml
@@ -120,13 +120,13 @@
 
   <!-- IME dependency -->
     <!-- OpenWnn English -->
-    <string name="nicownn_english_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.11\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_english_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.12\nオムロン ソフトウェア(株)/hiroshica</string>
 
     <!-- OpenWnn Japanese -->
-    <string name="nicownn_japanese_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.11\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_japanese_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.12\nオムロン ソフトウェア(株)/hiroshica</string>
 
     <!-- OpenWnn Chinese -->
-    <string name="nicownn_china_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.11\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_china_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.12\nオムロン ソフトウェア(株)/hiroshica</string>
 
   <!-- Candidate Delete -->
       <string name="button_candidate_select">選　択</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b256007..edfe85f 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -125,20 +125,20 @@
 
   <!-- IME dependency -->
   <!-- OpenWnn English -->
-  <string name="nicownn_english_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.11</string>
+  <string name="nicownn_english_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.12</string>
   <string name="nicownn_english">nicoWnn English</string>
   <string name="nicownn_english_system_dictionary">/data/data/com.hiroshica.android.input.nicownn2/lib/libWnnEngDic.so</string>
   <string name="nicownn_english_writable_dictionary">/data/data/com.hiroshica.android.input.nicownn2/writableEN.dic</string>
   <string name="en_word_separators">.,;:!?</string>
 
   <!-- OpenWnn Japanese -->
-  <string name="nicownn_japanese_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.11</string>
+  <string name="nicownn_japanese_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.12</string>
   <string name="nicownn_japanese">nicoWnn IME</string>
   <string name="openwnn_japanese_system_dictionary">/data/data/com.hiroshica.android.input.nicownn2/lib/libWnnJpnDic.so</string>
   <string name="nicownn_japanese_writable_dictionary">/data/data/com.hiroshica.android.input.nicownn2/writableJAJP.dic</string>
 
   <!-- OpenWnn Chinese -->
-  <string name="nicownn_china_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.11</string>
+  <string name="nicownn_china_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.12</string>
   <string name="nicownn_china">nicoWnn Chinese</string>
   <string name="openwnn_china_system_dictionary">/data/data/com.hiroshica.android.input.nicownn2/lib/libWnnZHCNDic.so</string>
   <!-- After Config Change -->

diff --git a/src/com/hiroshica/android/input/nicownn2/DefaultSoftKeyboard.java b/src/com/hiroshica/android/input/nicownn2/DefaultSoftKeyboard.java
index b63e73b..d723216 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/DefaultSoftKeyboard.java
+++ b/src/com/hiroshica/android/input/nicownn2/DefaultSoftKeyboard.java
@@ -585,9 +585,7 @@ public class DefaultSoftKeyboard implements InputViewManager, KeyboardView.OnKey
 
                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) { 
-                       mMainView.addView(mSubView);
-               }
+
                if (mKeyboardView != null) {
                        mMainView.addView(mKeyboardView);
                }

diff --git a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
index a47f4f1..eaff857 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
+++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
@@ -458,27 +458,22 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                mChangeYLineBellMode   = pref.getBoolean("change_y_bellmode", false);
                mChangeBellMode        = pref.getBoolean("change_bellmode", false);
 
-               if (mHardKeyboardHidden) {
-                       /* Create the suitable keyboard object */
-                       if (mDisplayMode == DefaultSoftKeyboard.PORTRAIT) {
-                               //mCurrentKeyboardType = KEYBOARD_12KEY;
-                               createKeyboardsPortrait(parent);
-                               mFlickLimitX = 24;
-                               mFlickLimitY = 24;
-                       } else {
-                               //mCurrentKeyboardType = KEYBOARD_QWERTY;
-                               createKeyboardsLandscape(parent);
-                               mFlickLimitX = 24;
-                               mFlickLimitY = 20;
-                       }
-            
-                       if (mCurrentKeyboardType == KEYBOARD_12KEY) {
-                               mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE,
-                                                             NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_12KEY));
-                       } else {
-                               mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE,
-                                                             NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_QWERTY));
-                       }
+               /* Create the suitable keyboard object */
+               if (mDisplayMode == DefaultSoftKeyboard.PORTRAIT) {
+                       //mCurrentKeyboardType = KEYBOARD_12KEY;
+                       createKeyboardsPortrait(parent);
+                       mFlickLimitX = 24;
+                       mFlickLimitY = 24;
+               } else {
+                       //mCurrentKeyboardType = KEYBOARD_QWERTY;
+                       createKeyboardsLandscape(parent);
+                       mFlickLimitX = 24;
+                       mFlickLimitY = 20;
+               }
+                       
+               if (mCurrentKeyboardType == KEYBOARD_12KEY) {
+                       mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE,
+                                                     NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_12KEY));
                } else {
                        mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE,
                                                      NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_QWERTY));