mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Merge from savannah/emacs-30

Browse source 
67f291ddae Correct conditions for iconification on Android
130c3efa10 Fix execution of MS-Windows app execution aliases in Eshell
fffab032b0 Improve 'tab-line-tabs-fixed-window-buffers' sorting perf...
This commit is contained in:
Po Lu 2024-07-08 15:43:55 +08:00
commit ce56f939af
3 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
java/org/gnu/emacs/EmacsActivity.java
View file

@ -78,7 +78,7 @@ public class EmacsActivity extends Activity
public static EmacsWindow focusedWindow;
/* Whether or not this activity is paused. */
private boolean isPaused;
private boolean isStopped;
/* Whether or not this activity is fullscreen. */
private boolean isFullscreen;
@ -196,7 +196,7 @@ public class EmacsActivity extends Activity
window.view.requestFocus ();
/* If the activity is iconified, send that to the window. */
if (isPaused)
if (isStopped)
window.noticeIconified ();
/* Invalidate the focus. Since attachWindow may be called from
@ -308,8 +308,13 @@ public class EmacsActivity extends Activity
public final void
onStop ()
{
timeOfLastInteraction = SystemClock.elapsedRealtime ();
/* Iconification was previously reported in onPause, but that was
misinformed, as `onStop' is the actual callback activated upon
changes in an activity's visibility. */
isStopped = true;
EmacsWindowManager.MANAGER.noticeIconified (this);
timeOfLastInteraction = SystemClock.elapsedRealtime ();
super.onStop ();
}
@ -403,21 +408,11 @@ public class EmacsActivity extends Activity
invalidateFocus (3);
}
@Override
public final void
onPause ()
{
isPaused = true;
EmacsWindowManager.MANAGER.noticeIconified (this);
super.onPause ();
}
@Override
public final void
onResume ()
{
isPaused = false;
isStopped = false;
timeOfLastInteraction = 0;
EmacsWindowManager.MANAGER.noticeDeiconified (this);