From 5b4dea0fc781fe40548e7b58fe5bd201a05f3913 Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Tue, 6 Jun 2023 14:35:19 +0800
Subject: Update Android port

* java/org/gnu/emacs/EmacsContextMenu.java (display): Use
`EmacsHolder' instead of `Holder'.
* java/org/gnu/emacs/EmacsDialog.java (toAlertDialog): Use
`EmacsDialogButtonLayout' to ensure that buttons are wrapped
properly.
(display): Adjust for new holder class.
* java/org/gnu/emacs/EmacsDialogButtonLayout.java
(EmacsDialogButtonLayout, onMeasure, onLayout): New functions.

* java/org/gnu/emacs/EmacsDrawLine.java:
* java/org/gnu/emacs/EmacsFillPolygon.java: Remove redundant
imports.
* java/org/gnu/emacs/EmacsHolder.java (EmacsHolder<T>):
* java/org/gnu/emacs/EmacsService.java (class Holder<T>)
(getEmacsView, EmacsService): Rename `Holder' to `EmacsHolder'
and make it public.
---
 java/org/gnu/emacs/EmacsContextMenu.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/org/gnu/emacs/EmacsContextMenu.java')

diff --git a/java/org/gnu/emacs/EmacsContextMenu.java b/java/org/gnu/emacs/EmacsContextMenu.java
index 5bae41bd61d..60f2db67fb0 100644
--- a/java/org/gnu/emacs/EmacsContextMenu.java
+++ b/java/org/gnu/emacs/EmacsContextMenu.java
@@ -331,9 +331,9 @@ public final class EmacsContextMenu
 	   final int yPosition, final int serial)
   {
     Runnable runnable;
-    final Holder<Boolean> rc;
+    final EmacsHolder<Boolean> rc;
 
-    rc = new Holder<Boolean> ();
+    rc = new EmacsHolder<Boolean> ();
 
     runnable = new Runnable () {
 	@Override
-- 
cgit v1.3