From 2134fd9f2767f6c0d14d3ad45cabcb963a06a8ed Mon Sep 17 00:00:00 2001 From: Po Lu 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. --- java/org/gnu/emacs/EmacsOpenActivity.java | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'java/org/gnu/emacs/EmacsOpenActivity.java') diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java index 3832cd2faab..ea503ebd120 100644 --- a/java/org/gnu/emacs/EmacsOpenActivity.java +++ b/java/org/gnu/emacs/EmacsOpenActivity.java @@ -232,19 +232,14 @@ public final class EmacsOpenActivity extends Activity int read; String content; - Log.d (TAG, "checkReadableOrCopy: " + file); - inFile = new File (file); if (inFile.canRead ()) return file; - Log.d (TAG, "checkReadableOrCopy: NO"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { content = EmacsService.buildContentName (uri); - Log.d (TAG, "checkReadableOrCopy: " + content); return content; } @@ -509,8 +504,6 @@ public final class EmacsOpenActivity extends Activity public void onDestroy () { - Log.d (TAG, "onDestroy: " + this); - /* Clear `currentActivity' if it refers to the activity being destroyed. */ @@ -524,9 +517,6 @@ public final class EmacsOpenActivity extends Activity public void onWindowFocusChanged (boolean isFocused) { - Log.d (TAG, "onWindowFocusChanged: " + this + ", is now focused: " - + isFocused); - if (isFocused) currentActivity = this; else if (currentActivity == this) @@ -539,8 +529,6 @@ public final class EmacsOpenActivity extends Activity public void onPause () { - Log.d (TAG, "onPause: " + this); - /* XXX: clear currentActivity here as well; I don't know whether or not onWindowFocusChanged is always called prior to this. */ -- cgit v1.3