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/EmacsService.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 6d70536faf0..2074a5b7c2b 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -71,11 +71,6 @@ import android.util.DisplayMetrics;
 
 import android.widget.Toast;
 
-class Holder<T>
-{
-  T thing;
-};
-
 /* EmacsService is the service that starts the thread running Emacs
    and handles requests by that Emacs instance.  */
 
@@ -282,9 +277,9 @@ public final class EmacsService extends Service
 		final boolean isFocusedByDefault)
   {
     Runnable runnable;
-    final Holder<EmacsView> view;
+    final EmacsHolder<EmacsView> view;
 
-    view = new Holder<EmacsView> ();
+    view = new EmacsHolder<EmacsView> ();
 
     runnable = new Runnable () {
 	public void
@@ -604,10 +599,10 @@ public final class EmacsService extends Service
   public ClipboardManager
   getClipboardManager ()
   {
-    final Holder<ClipboardManager> manager;
+    final EmacsHolder<ClipboardManager> manager;
     Runnable runnable;
 
-    manager = new Holder<ClipboardManager> ();
+    manager = new EmacsHolder<ClipboardManager> ();
 
     runnable = new Runnable () {
 	public void
-- 
cgit v1.3