From 09aa948ab48261b13550b76a5820d3473caf200a Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Thu, 2 Mar 2023 12:30:36 +0800
Subject: Improve criteria for restoring fullscreen state on Android

* java/Makefile.in ($(CLASS_FILES) &): Touch all class files,
even those javac chose not to rebuild.

* java/org/gnu/emacs/EmacsActivity.java (onWindowFocusChanged):
Restore fullscreen state here.
(onResume): And not here.
---
 java/org/gnu/emacs/EmacsActivity.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'java/org/gnu')

diff --git a/java/org/gnu/emacs/EmacsActivity.java b/java/org/gnu/emacs/EmacsActivity.java
index c444110de60..bcfee3f7080 100644
--- a/java/org/gnu/emacs/EmacsActivity.java
+++ b/java/org/gnu/emacs/EmacsActivity.java
@@ -241,6 +241,15 @@ public class EmacsActivity extends Activity
       {
 	focusedActivities.add (this);
 	lastFocusedActivity = this;
+
+	/* Update the window insets as the focus change may have
+	   changed the window insets as well, and the system does not
+	   automatically restore visibility flags.  */
+
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN
+	    && Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+	    && isFullscreen)
+	  syncFullscreenWith (window);
       }
     else
       focusedActivities.remove (this);
@@ -264,9 +273,6 @@ public class EmacsActivity extends Activity
   {
     isPaused = false;
 
-    /* Update the window insets.  */
-    syncFullscreenWith (window);
-
     EmacsWindowAttachmentManager.MANAGER.noticeDeiconified (this);
     super.onResume ();
   }
-- 
cgit v1.2.1