Update Android port

* java/org/gnu/emacs/EmacsWindow.java (onSomeKindOfMotionEvent):
Dismiss splurious LeaveNotify events from button presses.
* src/android.c (android_change_window_attributes)
(android_change_gc, android_set_clip_rectangles)
(android_reparent_window, android_clear_window, android_map_window)
(android_unmap_window, android_resize_window, android_move_window)
(android_swap_buffers, android_fill_rectangle, android_copy_area)
(android_fill_polygon, android_draw_rectangle, android_draw_point)
(android_draw_line, android_clear_area, android_bell)
(android_set_input_focus, android_raise_window)
(android_lower_window, android_set_dont_focus_on_map)
(android_set_dont_accept_focus, android_get_keysym_name)
(android_toggle_on_screen_keyboard, android_restart_emacs)
(android_display_toast, android_update_ic, android_reset_ic)
(android_set_fullscreen): Optimize by specifying the class
explicitly when calling a method.

1 files changed, 10 insertions, 3 deletions

diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index 9d907d2b481..3569d93136b 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -906,9 +906,16 @@ public final class EmacsWindow extends EmacsHandleObject
         return true;
 
       case MotionEvent.ACTION_HOVER_EXIT:
-        EmacsNative.sendLeaveNotify (this.handle, (int) event.getX (),
-                                     (int) event.getY (),
-                                     event.getEventTime ());
+
+        /* If the exit event comes from a button press, its button
+           state will have extra bits compared to the last known
+           button state.  Since the exit event will interfere with
+           tool bar button presses, ignore such splurious events.  */
+
+        if ((event.getButtonState () & ~lastButtonState) == 0)
+          EmacsNative.sendLeaveNotify (this.handle, (int) event.getX (),
+                                       (int) event.getY (),
+                                       event.getEventTime ());
         return true;
 
       case MotionEvent.ACTION_BUTTON_PRESS: