ベル打ち追加時にlandscapeパネル表示にバグを混入してしまったのでそれを修正

ハードキーボードの対策始め。未確認

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6274e11..2033839 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="10" android:versionName="1.0.10">
+         android:versionCode="11" android:versionName="1.0.11">
   <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 8d7fcd6..3ce33e4 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.10\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_english_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.11\nオムロン ソフトウェア(株)/hiroshica</string>
 
     <!-- OpenWnn Japanese -->
-    <string name="nicownn_japanese_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.10\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_japanese_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.11\nオムロン ソフトウェア(株)/hiroshica</string>
 
     <!-- OpenWnn Chinese -->
-    <string name="nicownn_china_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.10\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_china_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.11\nオムロン ソフトウェア(株)/hiroshica</string>
 
   <!-- Candidate Delete -->
       <string name="button_candidate_select">選　択</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6dfb654..b256007 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.10</string>
+  <string name="nicownn_english_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.11</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.10</string>
+  <string name="nicownn_japanese_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.11</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.10</string>
+  <string name="nicownn_china_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.11</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/JAJP/DefaultSoftKeyboardJAJP.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
index 16d2a22..a47f4f1 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
+++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
@@ -680,7 +680,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                            mPreferenceKeyMode = KEYMODE_JA_FULL_NIKO;
                        } else {
                            //mLimitedKeyMode = new int[] {KEYMODE_JA_HALF_ALPHABET};
-                           mPreferenceKeyMode = KEYMODE_JA_HALF_ALPHABET;
+                           mPreferenceKeyMode = KEYMODE_JA_FULL_NIKO;
                        }
                        break;
 
@@ -1288,8 +1288,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
 
                        if (mHardKeyboardHidden != hidden) {
                                if ((mLimitedKeyMode != null)
-                                   || ((mCurrentKeyMode != KEYMODE_JA_FULL_HIRAGANA)
-                                       && (mCurrentKeyMode != KEYMODE_JA_HALF_ALPHABET))) {
+                                   || ((mCurrentKeyMode != KEYMODE_JA_FULL_NIKO) && (mCurrentKeyMode != KEYMODE_JA_FULL_HIRAGANA) && (mCurrentKeyMode != KEYMODE_JA_HALF_ALPHABET))) {
 
                                        mLastInputType = EditorInfo.TYPE_NULL;
                                        if (mWnn.isInputViewShown()) {
@@ -1312,17 +1311,16 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                int[] limits = mLimitedKeyMode;
 
                if (!mHardKeyboardHidden) { /* for hardware keyboard */
-                       if ((targetMode != KEYMODE_JA_FULL_HIRAGANA)
-                           && (targetMode != KEYMODE_JA_HALF_ALPHABET)) {
-
+                       if ((targetMode != KEYMODE_JA_FULL_NIKO) && (targetMode != KEYMODE_JA_FULL_HIRAGANA) && (targetMode != KEYMODE_JA_HALF_ALPHABET)) {
                                Locale locale = Locale.getDefault();
                                int keymode = KEYMODE_JA_HALF_ALPHABET;
                                if (locale.getLanguage().equals(Locale.JAPANESE.getLanguage())) {
                                        switch (targetMode) {
+                                       case KEYMODE_JA_FULL_NIKO:
                                        case KEYMODE_JA_FULL_HIRAGANA:
                                        case KEYMODE_JA_FULL_KATAKANA:
                                        case KEYMODE_JA_HALF_KATAKANA:
-                                               keymode = KEYMODE_JA_FULL_HIRAGANA;
+                                               keymode = KEYMODE_JA_FULL_NIKO;
                                                break;
                                        default:
                                                /* half-alphabet */
@@ -1776,8 +1774,8 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
 
     private void changeNicoBellLayout() {
        Keyboard[][] keyList, keyListOn;
-       keyList   = mKeyboard[LANG_JA][PORTRAIT][KEYBOARD_12KEY][KEYBOARD_SHIFT_OFF];
-       keyListOn = mKeyboard[LANG_JA][PORTRAIT][KEYBOARD_12KEY][KEYBOARD_SHIFT_ON];
+       keyList   = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_OFF];
+       keyListOn = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_ON];
        if (false == mChangeBellMode) {
            keyList[KEYMODE_JA_FULL_NIKO]     = mNikoKeyboard[NIKO_SLIDE_MODE_TOP];
            if (false == mChangeYLineBellMode) {