swype input: simplify IME management, allow text predictionto work

akshayaurora · akshayaurora · commit bda532de65b9 · 2013-04-02T23:14:13.000+05:30
and ensure IME doesn't take up entire screen in landscape mode

Tested with::
- Stock JellyBean keyboard with swiping and text prediction
- SwiftKey with flow and text prediction
- Swype Keyboard with swiping and text prediction
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -276,9 +276,6 @@ private void printConfig(EGL10 egl, EGLDisplay display,
     // Is Python ready to receive input events?
     static boolean mInputActivated = false;
 
-    // Is Composing text being repeated?
-    static boolean mComposingText = false;
-
     // The number of times we should clear the screen after swap.
     private int mClears = 2;
 
@@ -475,7 +472,6 @@ public void onDestroy() {
 			InputMethodManager inputMethodManager = (InputMethodManager)getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
             inputMethodManager.hideSoftInputFromInputMethod(this.getWindowToken(), 0);
 
-
 			// application didn't leave, give 10s before closing.
 			// hopefully, this could be enough for launching the on_stop() trigger within the app.
 			mPause = PAUSE_STOP_REQUEST;
@@ -877,7 +873,6 @@ public int swapBuffers() {
 
 	private static final int INVALID_POINTER_ID = -1;
 	private int mActivePointerId = INVALID_POINTER_ID;
-	private static String mCompText = "";
 
     @Override
     public boolean onTouchEvent(final MotionEvent event) {
@@ -987,14 +982,6 @@ public boolean onKeyMultiple(int keyCode, int count, KeyEvent event){
         }
         if (mInputActivated && event.getAction() == KeyEvent.ACTION_MULTIPLE){
                 keys.getChars(0, keys.length(), keysBuffer, 0);
-                if (mComposingText == true){
-                    mComposingText = false;
-                    this.mCompText = keys;
-                }else if (this.mCompText.equals(keys)){
-                    // skip on composing text
-                    this.mCompText = "";
-                    return true;
-                }
 
                 for(char c: keysBuffer){
                         //Log.i("python", "Char from multiply " + (int) c);
@@ -1030,31 +1017,15 @@ public boolean onKeyPreIme(int keyCode, final KeyEvent event){
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        outAttrs.inputType = EditorInfo.TYPE_NULL;
-        return new BaseInputConnection(this, false) {
-
-            @Override
-            public boolean setComposingText(CharSequence text,
-                                            int newCursorPosition) {
-                commitText(text, 0);
-                mComposingText = true;
-                sendKeyEvent(
-                            new KeyEvent(
-                                        KeyEvent.ACTION_DOWN,
-                                        KeyEvent.KEYCODE_SPACE));
-                sendKeyEvent(
-                            new KeyEvent(
-                                        KeyEvent.ACTION_UP,
-                                        KeyEvent.KEYCODE_SPACE));
-                //Log.i("Python:", String.format("set Composing Text %s", mComposingText));
-                return true;
-            }
-        };
+        // setting inputtype to TYPE_CLASS_TEXT is necessary for swiftkey to enable
+        outAttrs.inputType = EditorInfo.TYPE_CLASS_TEXT;
+        // ask IME to avoid taking full screen on landscape mode
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI;
+        return new BaseInputConnection(this, false);
     }
 
     static void activateInput() {
         mInputActivated = true;
-        mComposingText = false;
     }
 
 	static void openUrl(String url) {
