summaryrefslogtreecommitdiff
path: root/java/org/gnu/emacs/EmacsActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/org/gnu/emacs/EmacsActivity.java')
-rw-r--r--java/org/gnu/emacs/EmacsActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/java/org/gnu/emacs/EmacsActivity.java b/java/org/gnu/emacs/EmacsActivity.java
index d377cf982ef..30eaf85805a 100644
--- a/java/org/gnu/emacs/EmacsActivity.java
+++ b/java/org/gnu/emacs/EmacsActivity.java
@@ -134,6 +134,10 @@ public class EmacsActivity extends Activity
layout.addView (window.view);
child.setConsumer (this);
+ /* If the window isn't no-focus-on-map, focus its view. */
+ if (!child.getDontFocusOnMap ())
+ window.view.requestFocus ();
+
/* If the activity is iconified, send that to the window. */
if (isPaused)
window.noticeIconified ();
@@ -233,7 +237,7 @@ public class EmacsActivity extends Activity
isPaused = true;
EmacsWindowAttachmentManager.MANAGER.noticeIconified (this);
- super.onResume ();
+ super.onPause ();
}
@Override