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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user