QWERTYの処理の見直し（まだダメな時あり）

diff --git a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
index 3fda397..78adf60 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
+++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
@@ -422,7 +422,6 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
        private Keyboard[][] mBellKeyboard;
 
        /** option keyboard type */
-       private boolean mHookKeyType;
        private int     mHookStockKeyType;
 
        /** change eisu change mode **/
@@ -438,7 +437,6 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
        public DefaultSoftKeyboardJAJP() {
                mCurrentLanguage     = LANG_JA;
                mCurrentKeyboardType = KEYBOARD_12KEY;
-               mHookKeyType         = false;
                mHookStockKeyType    = KEYBOARD_12KEY;
                mShiftOn             = KEYBOARD_SHIFT_OFF;
                mCurrentKeyMode      = KEYMODE_JA_FULL_NIKO;
@@ -710,13 +708,8 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                mChangeBellMode        = pref.getBoolean("change_bellmode", false);
                if (old12keyqwerty != mChange12keyQwertyMode) {
                    restartkey = true;
-                   if (true == mChange12keyQwertyMode && false == mHookKeyType) {
-                       mHookKeyType = true;
-                       mHookStockKeyType = mCurrentKeyboardType;
-                   }
-                   if (false == mChange12keyQwertyMode && true == mHookKeyType) {
-                       mHookKeyType = false;
-                       mCurrentKeyboardType = mHookStockKeyType;
+                   if (false == mChange12keyQwertyMode) {
+                       mCurrentKeyboardType = mHookStockKeyType; // change last keyboard type.
                    }
                }
                if (oldnicobell != mChangeBellMode) {
@@ -1422,13 +1415,11 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
 
                case KEYCODE_QWERTY_KBD:
                        changeKeyboardType(KEYBOARD_12KEY);
-                       mHookKeyType = false;
                        mHookStockKeyType = KEYBOARD_12KEY;
                        break;
             
                case KEYCODE_JP12_KBD:
                        changeKeyboardType(KEYBOARD_QWERTY);
-                       mHookKeyType = false;
                        mHookStockKeyType = KEYBOARD_QWERTY;
                        break;