Correct conditions for iconification on Android
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity) <isPaused>: Rename to <isStopped>. (attachWindow): Adjust to match. (onPause): Delete function. (onStop): Deem frames iconified after calls to onStop instead.
This commit is contained in:
parent
130c3efa10
commit
67f291ddae
1 changed files with 9 additions and 14 deletions
|
@ -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 @@ children and RESETWHENCHILDLESS is set (implying it is a
|
|||
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 @@ children and RESETWHENCHILDLESS is set (implying it is a
|
|||
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 @@ children and RESETWHENCHILDLESS is set (implying it is a
|
|||
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);
|
||||
|
|
Loading…
Add table
Reference in a new issue