From 2134fd9f2767f6c0d14d3ad45cabcb963a06a8ed Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Mon, 28 Aug 2023 13:08:22 +0800
Subject: Update Android port

* java/org/gnu/emacs/EmacsActivity.java (attachWindow, onDestroy)
(onWindowFocusChanged, onContextMenuClosed):

* java/org/gnu/emacs/EmacsContextMenu.java (onMenuItemClick):

* java/org/gnu/emacs/EmacsDialog.java (onClick, display1, onDismiss):

* java/org/gnu/emacs/EmacsOpenActivity.java (checkReadableOrCopy)
(onDestroy, onWindowFocusChanged, onPause):

* java/org/gnu/emacs/EmacsWindowAttachmentManager.java
(registerWindow, removeWindowConsumer, detachWindow)
(noticeIconified, noticeDeiconified): Remove superfluous
debugging code now that the Android port is stable.

* java/org/gnu/emacs/EmacsView.java (onLayout): Detect if the
IME is hidden while a toplevel window is focused, and clear
isCurrentlyTextEditor in that case.
(onApplyWindowInsets): New function.
(raise, lower, popupMenu, onCreateInputConnection): Delete
aforementioned debugging code.
---
 .../gnu/emacs/EmacsWindowAttachmentManager.java    | 24 ----------------------
 1 file changed, 24 deletions(-)

(limited to 'java/org/gnu/emacs/EmacsWindowAttachmentManager.java')

diff --git a/java/org/gnu/emacs/EmacsWindowAttachmentManager.java b/java/org/gnu/emacs/EmacsWindowAttachmentManager.java
index bc96de7fe1a..4ba5b35aacf 100644
--- a/java/org/gnu/emacs/EmacsWindowAttachmentManager.java
+++ b/java/org/gnu/emacs/EmacsWindowAttachmentManager.java
@@ -87,21 +87,17 @@ public final class EmacsWindowAttachmentManager
   public void
   registerWindowConsumer (WindowConsumer consumer)
   {
-    Log.d (TAG, "registerWindowConsumer " + consumer);
-
     consumers.add (consumer);
 
     for (EmacsWindow window : windows)
       {
 	if (window.getAttachedConsumer () == null)
 	  {
-	    Log.d (TAG, "registerWindowConsumer: attaching " + window);
 	    consumer.attachWindow (window);
 	    return;
 	  }
       }
 
-    Log.d (TAG, "registerWindowConsumer: sendWindowAction 0, 0");
     EmacsNative.sendWindowAction ((short) 0, 0);
   }
 
@@ -111,21 +107,16 @@ public final class EmacsWindowAttachmentManager
     Intent intent;
     ActivityOptions options;
 
-    Log.d (TAG, "registerWindow (maybe): " + window);
-
     if (windows.contains (window))
       /* The window is already registered.  */
       return;
 
-    Log.d (TAG, "registerWindow: " + window);
-
     windows.add (window);
 
     for (WindowConsumer consumer : consumers)
       {
 	if (consumer.getAttachedWindow () == null)
 	  {
-	    Log.d (TAG, "registerWindow: attaching " + consumer);
 	    consumer.attachWindow (window);
 	    return;
 	  }
@@ -147,8 +138,6 @@ public final class EmacsWindowAttachmentManager
 	EmacsService.SERVICE.startActivity (intent,
 					    options.toBundle ());
       }
-
-    Log.d (TAG, "registerWindow: startActivity");
   }
 
   public void
@@ -156,19 +145,14 @@ public final class EmacsWindowAttachmentManager
   {
     EmacsWindow window;
 
-    Log.d (TAG, "removeWindowConsumer " + consumer);
-
     window = consumer.getAttachedWindow ();
 
     if (window != null)
       {
-	Log.d (TAG, "removeWindowConsumer: detaching " + window);
-
 	consumer.detachWindow ();
 	window.onActivityDetached (isFinishing);
       }
 
-    Log.d (TAG, "removeWindowConsumer: removing " + consumer);
     consumers.remove (consumer);
   }
 
@@ -177,14 +161,10 @@ public final class EmacsWindowAttachmentManager
   {
     WindowConsumer consumer;
 
-    Log.d (TAG, "detachWindow " + window);
-
     if (window.getAttachedConsumer () != null)
       {
 	consumer = window.getAttachedConsumer ();
 
-	Log.d (TAG, "detachWindow: removing" + consumer);
-
 	consumers.remove (consumer);
 	consumer.destroy ();
       }
@@ -197,8 +177,6 @@ public final class EmacsWindowAttachmentManager
   {
     EmacsWindow window;
 
-    Log.d (TAG, "noticeIconified " + consumer);
-
     /* If a window is attached, send the appropriate iconification
        events.  */
     window = consumer.getAttachedWindow ();
@@ -212,8 +190,6 @@ public final class EmacsWindowAttachmentManager
   {
     EmacsWindow window;
 
-    Log.d (TAG, "noticeDeiconified " + consumer);
-
     /* If a window is attached, send the appropriate iconification
        events.  */
     window = consumer.getAttachedWindow ();
-- 
cgit v1.3