1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-02 05:32:08 -08:00

Merge from savannah/emacs-30

ded77fefff Fix remaining Android bugs reported over the past months
This commit is contained in:
Po Lu 2025-02-19 20:42:22 +08:00
commit 9faa8d32a3
4 changed files with 71 additions and 24 deletions

View file

@ -179,6 +179,8 @@ public class EmacsActivity extends Activity
public final void
attachWindow (EmacsWindow child)
{
FrameLayout.LayoutParams defaultParams;
if (window != null)
throw new IllegalStateException ("trying to attach window when one"
+ " already exists");
@ -187,8 +189,15 @@ public class EmacsActivity extends Activity
/* Record and attach the view. */
/* Reset residual LayoutParams that might remain in effect on this
window, or some distributions of Android (e.g. Huawei HarmonyOS
4.2) will retain the size of this window as a child frame. */
defaultParams
= new FrameLayout.LayoutParams (FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.MATCH_PARENT);
syncFullscreenWith (child);
window = child;
layout.addView (window.view);
layout.addView (window.view, defaultParams);
child.setConsumer (this);
/* If the window isn't no-focus-on-map, focus its view. */