Ver.1.2.5.1:

[nicownn/NicoWnn.git] / src / com / hiroshica / android / input / nicownn2 / JAJP / DefaultSoftKeyboardTest.java

diff --git a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardTest.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardTest.java
index 696b3eb..d83a336 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardTest.java
+++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardTest.java
@@ -193,8 +193,6 @@ public class DefaultSoftKeyboardTest extends DefaultSoftKeyboard {
        private final int ALPHAMODE_SMALL = 0;
        private final int ALPHAMODE_BIG   = 1;
        private int mChangeAlphaBigMode = ALPHAMODE_SMALL;
-       /** option softkeyboard on/off **/
-       private boolean mHiddenSoftKeyboard = false;
 
        /** Default constructor */
        public DefaultSoftKeyboardTest(SetupKeyboard keyboard) {
@@ -221,7 +219,7 @@ public class DefaultSoftKeyboardTest extends DefaultSoftKeyboard {
                boolean getalphamode  = pref.getBoolean("change_alphamode", false);
                mGetNoFlipScreen       = pref.getBoolean("no_flip_screen", false);
                mFlickNicoInput        = flickModeTable.get(pref.getString("nicoflick_mode", "none_flick"));
-               mHiddenSoftKeyboard    = pref.getBoolean("hidden_softkeyboard", false);
+               //mHiddenSoftKeyboard    = pref.getBoolean("hidden_softkeyboard", false);
                
                if (false == getalphamode) {
                        mChangeAlphaBigMode = ALPHAMODE_SMALL;
@@ -254,6 +252,13 @@ public class DefaultSoftKeyboardTest extends DefaultSoftKeyboard {
        }
 
        /**
+        *
+        */
+       @Override public void checkHiddenKeyboard() {
+               super.checkHiddenKeyboard();
+       }
+
+       /**
         * Commit the pre-edit string for committing operation that is not explicit
         * (ex. when a candidate is selected)
         */
@@ -435,7 +440,7 @@ public class DefaultSoftKeyboardTest extends DefaultSoftKeyboard {
                boolean getalphamode  = pref.getBoolean("change_alphamode", false);
                mGetNoFlipScreen       = pref.getBoolean("no_flip_screen", false);
                mFlickNicoInput        = flickModeTable.get(pref.getString("nicoflick_mode", "none_flick"));
-               mHiddenSoftKeyboard    = pref.getBoolean("hidden_softkeyboard", false);
+               //mHiddenSoftKeyboard    = pref.getBoolean("hidden_softkeyboard", false);
                
                if (false == getalphamode) {
                        mChangeAlphaBigMode = ALPHAMODE_SMALL;
@@ -569,7 +574,8 @@ public class DefaultSoftKeyboardTest extends DefaultSoftKeyboard {
         * @param parent  The context
         */
        private void createKeyboardsLandscape(NicoWnn parent) {
-               if (true == mHardKeyboardHidden && true == mHiddenSoftKeyboard) {
+               //if ((true == isHardQwertyOnLandscape()) && (true == mHiddenSoftKeyboard)) {
+               if (true == isHardQwertyOnLandscape()) {
                        return;                         // not create soft keyboard
                }
 
@@ -693,7 +699,7 @@ public class DefaultSoftKeyboardTest extends DefaultSoftKeyboard {
        }
 
        /** @see com.hiroshica.android.input.nicownn2.DefaultSoftKeyboard#setHardKeyboardHidden */
-       @Override public void setHardKeyboardHidden(boolean hidden) {
+       @Override public void setHardKeyboardHidden(boolean hidden, boolean qwerty) {
                if (mWnn != null) {
                        if (!hidden) {
                                mWnn.onEvent(mEventChangeModeQwerty);
@@ -709,7 +715,7 @@ public class DefaultSoftKeyboardTest extends DefaultSoftKeyboard {
                                }
                        }
                }
-               super.setHardKeyboardHidden(hidden);
+               super.setHardKeyboardHidden(hidden, qwerty);
        }
 
        /**