feature/android 48329b79148 2/2: Update Android port

[Po Lu]

branch: feature/android
commit 48329b79148d09ff7d0951fce97e3966fd504b13
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Update Android port
    
    * lisp/touch-screen.el (touch-screen-handle-touch): Fix
    treatment of stray update events.
---
 lisp/touch-screen.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el
index 8f10bc3e794..5606f752042 100644
--- a/lisp/touch-screen.el
+++ b/lisp/touch-screen.el
@@ -850,6 +850,10 @@ the place of EVENT within the key sequence being 
translated, or
                ;; Start the long-press timer.
                (touch-screen-handle-timeout nil)))))
      ((eq (car event) 'touchscreen-update)
+      (unless touch-screen-current-tool
+        ;; If a stray touchscreen-update event arrives (most likely
+        ;; from the menu bar), stop translating this sequence.
+        (throw 'input-event nil))
       ;; The positions of tools currently pressed against the screen
       ;; have changed.  If there is a tool being tracked as part of a
       ;; gesture, look it up in the list of tools.