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:
@@ -20,7 +20,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
||||
package org.gnu.emacs;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.ColorStateList;
|
||||
|
||||
import android.text.InputType;
|
||||
|
||||
@@ -116,6 +115,7 @@ public final class EmacsView extends ViewGroup
|
||||
super (EmacsService.SERVICE);
|
||||
|
||||
Object tem;
|
||||
Context context;
|
||||
|
||||
this.window = window;
|
||||
this.damageRegion = new Region ();
|
||||
@@ -133,7 +133,8 @@ public final class EmacsView extends ViewGroup
|
||||
setDefaultFocusHighlightEnabled (false);
|
||||
|
||||
/* Obtain the input method manager. */
|
||||
tem = getContext ().getSystemService (Context.INPUT_METHOD_SERVICE);
|
||||
context = getContext ();
|
||||
tem = context.getSystemService (Context.INPUT_METHOD_SERVICE);
|
||||
imManager = (InputMethodManager) tem;
|
||||
}
|
||||
|
||||
@@ -281,7 +282,6 @@ public final class EmacsView extends ViewGroup
|
||||
int count, i;
|
||||
View child;
|
||||
Rect windowRect;
|
||||
int wantedWidth, wantedHeight;
|
||||
|
||||
count = getChildCount ();
|
||||
|
||||
@@ -422,7 +422,6 @@ public final class EmacsView extends ViewGroup
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* The following two functions must not be called if the view has no
|
||||
parent, or is parented to an activity. */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user