Update Android port

* java/org/gnu/emacs/EmacsService.java (sync): Delete function.
* java/org/gnu/emacs/EmacsView.java (handleDirtyBitmap): Erase
with window background.
(onDetachedFromWindow): Only recycle bitmap if non-NULL.
* java/org/gnu/emacs/EmacsWindow.java (background): New field.
(changeWindowBackground): Set it.
* src/android.c (struct android_emacs_service): Remove `sync'.
(android_init_emacs_service): Likewise.
(android_sync): Delete function.
* src/androidfns.c (android_create_tip_frame): Set frame
background color correctly.
(Fx_show_tip): Make the tip frame visible.
* src/androidgui.h: Update prototypes.
* src/androidterm.c (handle_one_android_event): Handle tooltip
movement correctly.

4 files changed, 17 insertions, 18 deletions

diff --git a/src/android.c b/src/android.c
index 656971e154f..9fc4143602c 100644
--- a/src/android.c
+++ b/src/android.c
@@ -104,7 +104,6 @@ struct android_emacs_service
   jmethodID get_screen_height;
   jmethodID detect_mouse;
   jmethodID name_keysym;
-  jmethodID sync;
   jmethodID browse_url;
   jmethodID restart_emacs;
   jmethodID update_ic;
@@ -2122,7 +2121,6 @@ android_init_emacs_service (void)
   FIND_METHOD (get_screen_height, "getScreenHeight", "(Z)I");
   FIND_METHOD (detect_mouse, "detectMouse", "()Z");
   FIND_METHOD (name_keysym, "nameKeysym", "(I)Ljava/lang/String;");
-  FIND_METHOD (sync, "sync", "()V");
   FIND_METHOD (browse_url, "browseUrl", "(Ljava/lang/String;)"
                "Ljava/lang/String;");
   FIND_METHOD (restart_emacs, "restartEmacs", "()V");
@@ -4514,15 +4512,6 @@ android_translate_coordinates (android_window src, int x,
   ANDROID_DELETE_LOCAL_REF (coordinates);
 }
 
-void
-android_sync (void)
-{
-  (*android_java_env)->CallVoidMethod (android_java_env,
-                                       emacs_service,
-                                       service_class.sync);
-  android_exception_check ();
-}
-
 int
 android_wc_lookup_string (android_key_pressed_event *event,
                           wchar_t *buffer_return, int wchars_buffer,
diff --git a/src/androidfns.c b/src/androidfns.c
index 4837b00a21e..5a23e8bd196 100644
--- a/src/androidfns.c
+++ b/src/androidfns.c
@@ -1883,9 +1883,10 @@ android_create_tip_frame (struct android_display_info *dpyinfo,
     unsigned long mask;
 
     block_input ();
-    mask = ANDROID_CW_OVERRIDE_REDIRECT;
+    mask = ANDROID_CW_OVERRIDE_REDIRECT | ANDROID_CW_BACK_PIXEL;
 
     attrs.override_redirect = true;
+    attrs.background_pixel = FRAME_BACKGROUND_PIXEL (f);
     tip_window
       = FRAME_ANDROID_WINDOW (f)
       = android_create_window (FRAME_DISPLAY_INFO (f)->root_window,
@@ -2314,10 +2315,6 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
   android_map_raised (FRAME_ANDROID_WINDOW (tip_f));
   unblock_input ();
 
-  /* Synchronize with the UI thread.  This is required to prevent ugly
-     black splotches.  */
-  android_sync ();
-
   /* Garbage the tip frame too.  */
   SET_FRAME_GARBAGED (tip_f);
 
@@ -2328,6 +2325,11 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
   unbind_to (count_1, Qnil);
   windows_or_buffers_changed = old_windows_or_buffers_changed;
 
+  /* MapNotify events are not sent on Android, so make the frame
+     visible.  */
+
+  SET_FRAME_VISIBLE (tip_f, true);
+
  start_timer:
   /* Let the tip disappear after timeout seconds.  */
   tip_timer = call3 (Qrun_at_time, timeout, Qnil,
diff --git a/src/androidgui.h b/src/androidgui.h
index 84419457a8a..6514c78d289 100644
--- a/src/androidgui.h
+++ b/src/androidgui.h
@@ -606,8 +606,6 @@ extern void android_move_resize_window (android_window, int, int,
 extern void android_map_raised (android_window);
 extern void android_translate_coordinates (android_window, int,
                                            int, int *, int *);
-extern void android_sync (void);
-
 extern int android_wc_lookup_string (android_key_pressed_event *,
                                      wchar_t *, int, int *,
                                      enum android_lookup_status *);
diff --git a/src/androidterm.c b/src/androidterm.c
index 814af87819b..a6709ac8169 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -676,6 +676,16 @@ handle_one_android_event (struct android_display_info *dpyinfo,
       if (!f)
         goto OTHER;
 
+      if (FRAME_TOOLTIP_P (f))
+        {
+          if (FRAME_PIXEL_HEIGHT (f) != configureEvent.xconfigure.height
+              || FRAME_PIXEL_WIDTH (f) != configureEvent.xconfigure.width)
+            SET_FRAME_GARBAGED (f);
+
+          FRAME_PIXEL_HEIGHT (f) = configureEvent.xconfigure.height;
+          FRAME_PIXEL_WIDTH (f) = configureEvent.xconfigure.width;
+        }
+
       int width = configureEvent.xconfigure.width;
       int height = configureEvent.xconfigure.height;