Merge pull request kivy#205 from kivy/keyboard_height

tito · tito · commit 1b55914732d8 · 2014-05-03T16:38:54.000+02:00
Introduce method `get_keyboard_height` that returns current softkeyboard
diff --git a/recipes/android/src/android/_android.pyx b/recipes/android/src/android/_android.pyx
@@ -170,6 +170,18 @@ def get_dpi():
 cdef extern void android_show_keyboard(int)
 cdef extern void android_hide_keyboard()
 
+# get keyboard height
+def get_keyboard_height():
+    from jnius import autoclass
+    python_act = autoclass('org.renpy.android.PythonActivity')
+    rctx = autoclass('android.graphics.Rect')()
+    mActivity = python_act.mActivity
+    mActivity.getWindow().getDecorView().\
+        getWindowVisibleDisplayFrame(rctx)
+    height = mActivity.getWindowManager().getDefaultDisplay().getHeight()
+    return height - rctx.bottom
+
+
 # Flags for input_type, for requesting a particular type of keyboard
 #android FLAGS
 TYPE_CLASS_DATETIME = 4
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -1133,7 +1133,6 @@ public void run(){
 
     public void dispatchCommand(String message){
 
-        Boolean ret = false;
         int delay = 0;
         while (message.length() > 50){
             delayed_message(message.substring(0, 50), delay);
@@ -1147,7 +1146,7 @@ public void dispatchCommand(String message){
 
         if (DEBUG) Log.d(TAG, String.format("dispatch :%s", message));
         int keyCode = 45;
-        //send control sequence start \x01
+        //send control sequence start
         nativeKey(keyCode, 1, 1);
         nativeKey(keyCode, 0, 1);
 
@@ -1157,18 +1156,28 @@ public void dispatchCommand(String message){
             nativeKey(keyCode, 0, (int) message.charAt(i));
         }
 
-        //send control sequence start \x01
+        //send control sequence end \x02
         nativeKey(keyCode, 1, 2);
         nativeKey(keyCode, 0, 2);
 
     }
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        // setting inputtype to TYPE_CLASS_TEXT is necessary for swiftkey to enable
         outAttrs.inputType = inputType;
         // ask IME to avoid taking full screen on landscape mode
         outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI;
+
+        // add a listener for the layout chnages to the IME view
+        final android.view.View activityRootView = mActivity.getWindow().getDecorView();
+        activityRootView.getViewTreeObserver().addOnGlobalLayoutListener(new android.view.ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                //send control sequence start /x04 == kayboard layout changed
+                nativeKey(45, 1, 4);
+                nativeKey(45, 0, 4);
+                }
+            });
         return new BaseInputConnection(this, false){
 
             private void deleteLastText(){
