Update Android port

* doc/emacs/input.texi (On-Screen Keyboards): Document changes
to text conversion.
* java/org/gnu/emacs/EmacsInputConnection.java (getExtractedText)
(EmacsInputConnection):
* src/keyboard.c (read_key_sequence): Disable text conversion
after reading prefix key.
* src/textconv.c (get_extracted_text): Fix returned value when
request length is zero.

1 files changed, 19 insertions, 1 deletions

diff --git a/java/org/gnu/emacs/EmacsInputConnection.java b/java/org/gnu/emacs/EmacsInputConnection.java
index e2a15894695..834c2226c82 100644
--- a/java/org/gnu/emacs/EmacsInputConnection.java
+++ b/java/org/gnu/emacs/EmacsInputConnection.java
@@ -207,11 +207,19 @@ public class EmacsInputConnection extends BaseInputConnection
   public ExtractedText
   getExtractedText (ExtractedTextRequest request, int flags)
   {
+    ExtractedText text;
+
     if (EmacsService.DEBUG_IC)
       Log.d (TAG, "getExtractedText: " + request + " " + flags);
 
-    return EmacsNative.getExtractedText (windowHandle, request,
+    text = EmacsNative.getExtractedText (windowHandle, request,
 					 flags);
+
+    if (EmacsService.DEBUG_IC)
+      Log.d (TAG, "getExtractedText: " + text.text + " @"
+	     + text.startOffset + ":" + text.selectionStart);
+
+    return text;
   }
 
   @Override
@@ -225,6 +233,16 @@ public class EmacsInputConnection extends BaseInputConnection
     return true;
   }
 
+  @Override
+  public boolean
+  sendKeyEvent (KeyEvent key)
+  {
+    if (EmacsService.DEBUG_IC)
+      Log.d (TAG, "sendKeyEvent: " + key);
+
+    return super.sendKeyEvent (key);
+  }
+
 
   /* Override functions which are not implemented.  */