1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00

Update Android port

* java/org/gnu/emacs/EmacsActivity.java (onCreate):
* java/org/gnu/emacs/EmacsContextMenu.java:
* java/org/gnu/emacs/EmacsDocumentsProvider.java (getMimeType):
* java/org/gnu/emacs/EmacsDrawLine.java (perform):
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform):
* java/org/gnu/emacs/EmacsFillPolygon.java:
* java/org/gnu/emacs/EmacsFontDriver.java:
* java/org/gnu/emacs/EmacsHandleObject.java:
* java/org/gnu/emacs/EmacsInputConnection.java:
* java/org/gnu/emacs/EmacsMultitaskActivity.java
(EmacsMultitaskActivity):
* java/org/gnu/emacs/EmacsNative.java:
* java/org/gnu/emacs/EmacsNoninteractive.java
(EmacsNoninteractive, main):
* java/org/gnu/emacs/EmacsOpenActivity.java (EmacsOpenActivity)
(startEmacsClient):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java:
* java/org/gnu/emacs/EmacsSdk8Clipboard.java:
* java/org/gnu/emacs/EmacsService.java (EmacsService, onCreate):
* java/org/gnu/emacs/EmacsView.java (EmacsView, onLayout):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow):
* java/org/gnu/emacs/EmacsWindowAttachmentManager.java
(EmacsWindowAttachmentManager): Remove redundant includes.
Reorganize some functions around, remove duplicate `getLibDir'
functions, and remove unused local variables.
This commit is contained in:
Po Lu 2023-03-05 19:58:28 +08:00
parent 26b3b8433d
commit 1cae464859
19 changed files with 53 additions and 117 deletions

View file

@ -160,6 +160,7 @@ public final class EmacsDocumentsProvider extends DocumentsProvider
{
String name, extension, mime;
int extensionSeparator;
MimeTypeMap singleton;
if (file.isDirectory ())
return Document.MIME_TYPE_DIR;
@ -170,8 +171,9 @@ public final class EmacsDocumentsProvider extends DocumentsProvider
if (extensionSeparator > 0)
{
singleton = MimeTypeMap.getSingleton ();
extension = name.substring (extensionSeparator + 1);
mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension (extension);
mime = singleton.getMimeTypeFromExtension (extension);
if (mime != null)
return mime;