From 90e5e89b8da4cfc042608cfcbed76986d16ef68f Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Wed, 19 Feb 2025 15:34:51 +0800
Subject: [PATCH] Properly move existing tooltips on Android

* java/org/gnu/emacs/EmacsWindow.java (requestViewLayout): If an
override redirect window, additionally notify the window manager
of layout changes.

(cherry picked from commit e97be722d392056b6ef9e47664273ee2ca7df374)
---
 java/org/gnu/emacs/EmacsWindow.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index b91d2de46d9..6a4d4cba9b9 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -365,8 +365,17 @@ public final class EmacsWindow extends EmacsHandleObject
 	run ()
 	{
 	  if (overrideRedirect)
-	    /* Set the layout parameters again.  */
-	    view.setLayoutParams (getWindowLayoutParams ());
+	    {
+	      WindowManager.LayoutParams params;
+
+	      /* Set the layout parameters again.  */
+	      params = getWindowLayoutParams ();
+	      view.setLayoutParams (params);
+
+	      /* Announce this update to the window server.  */
+	      if (windowManager != null)
+		windowManager.updateViewLayout (view, params);
+	    }
 
 	  view.mustReportLayout = true;
 	  view.requestLayout ();
-- 
2.39.5