Update Android port

* java/org/gnu/emacs/EmacsService.java (displayToast):
* src/android.c (android_init_emacs_service): Remove unused
function.
* lisp/touch-screen.el (touch-screen-handle-point-up): Correctly
compute posn point.
(touch-screen-translate-touch): Update doc string.
(function-key-map): Define touch screen translation functions
within the internal border.

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 22649167f8a86e07eb8d0b5f72e33547d7a55628..6240b0e475a34b40fc73769156a97fd98eaf7d30 100644 (file)
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -1086,26 +1086,6 @@ public final class EmacsService extends Service
                        temp, };
   }
 
-  /* Display the specified STRING in a small dialog box on the main
-     thread.  */
-
-  public void
-  displayToast (final String string)
-  {
-    runOnUiThread (new Runnable () {
-       @Override
-       public void
-       run ()
-       {
-         Toast toast;
-
-         toast = Toast.makeText (getApplicationContext (),
-                                 string, Toast.LENGTH_SHORT);
-         toast.show ();
-       }
-      });
-  }
-
   public void
   updateExtractedText (EmacsWindow window, ExtractedText text,
                       int token)

diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el
index ef9b14f27ce84445e181450bb5cd8449a7996c55..68a7e213cdb6fe77b658654a10d1864f66f1cc43 100644 (file)
--- a/lisp/touch-screen.el
+++ b/lisp/touch-screen.el
@@ -25,6 +25,9 @@
 ;; This file provides code to recognize simple touch screen gestures.
 ;; It is used on X and Android, where the platform cannot recognize
 ;; them for us.
+;;
+;; See (elisp)Touchscreen Events for a description of the details of touch
+;; events.
 
 ;;; Code:
 
@@ -468,7 +471,7 @@ is not read-only."
         (posn (cdr point)) window point)
     (cond ((null what)
            (when (windowp (posn-window posn))
-             (setq point (posn-point point)
+             (setq point (posn-point posn)
                    window (posn-window posn))
              ;; Select the window that was tapped.
              (select-window window)
@@ -670,12 +673,18 @@ returned may contain any one of the following events:
 
 where WINDOW specifies a window to scroll, and DX and DY are
 integers describing how many pixels to be scrolled horizontally
-and vertically.
+and vertically,
+
+  (touchscreen-hold POSN)
+  (touchscreen-drag POSN)
+
+where POSN is the position of the long-press or touchpoint
+motion,
 
   (down-mouse-1 POSN)
   (drag-mouse-1 POSN)
 
-where POSN is the position of the mouse button press or click.
+where POSN is the position of the mouse button press or click,
 
   (mouse-1 POSN)
   (mouse-2 POSN)
@@ -744,6 +753,16 @@ if POSN is on a link or a button, or `mouse-1' otherwise."
 (define-key function-key-map [mode-line touchscreen-end]
             #'touch-screen-translate-touch)
 
+;; These are used to translate events sent from the internal border
+;; or from outside the frame.
+
+(define-key function-key-map [nil touchscreen-begin]
+            #'touch-screen-translate-touch)
+(define-key function-key-map [nil touchscreen-update]
+            #'touch-screen-translate-touch)
+(define-key function-key-map [nil touchscreen-end]
+            #'touch-screen-translate-touch)
+
 (define-key function-key-map [header-line touchscreen-begin]
             #'touch-screen-translate-touch)
 (define-key function-key-map [header-line touchscreen-update]

diff --git a/src/android.c b/src/android.c
index acc49219b3590aec14ae760c02028eae72dd4719..90288737c779de04d23aa3cbb0dcff04ae343b2f 100644 (file)
--- a/src/android.c
+++ b/src/android.c
@@ -2330,8 +2330,6 @@ android_init_emacs_service (void)
   FIND_METHOD (check_content_uri, "checkContentUri",
               "([BZZ)Z");
   FIND_METHOD (query_battery, "queryBattery", "()[J");
-  FIND_METHOD (display_toast, "displayToast",
-              "(Ljava/lang/String;)V");
   FIND_METHOD (update_extracted_text, "updateExtractedText",
               "(Lorg/gnu/emacs/EmacsWindow;"
               "Landroid/view/inputmethod/ExtractedText;I)V");