aboutsummaryrefslogtreecommitdiffstats
path: root/java/AndroidManifest.xml.in
diff options
context:
space:
mode:
authorPo Lu2023-01-20 19:06:32 +0800
committerPo Lu2023-01-20 19:06:32 +0800
commitd44b60c2f001d57b010f0e9b82f798fbad9a23d6 (patch)
tree1ff208bfccd74a3b2ad4488cd66c89762d0acd7e /java/AndroidManifest.xml.in
parente07b58dc35a66b5e611f437ec007292d82dc8f13 (diff)
downloademacs-d44b60c2f001d57b010f0e9b82f798fbad9a23d6.tar.gz
emacs-d44b60c2f001d57b010f0e9b82f798fbad9a23d6.zip
Update Android port
* .gitignore: Don't ignore verbose.mk.android. * doc/emacs/Makefile.in (EMACSSOURCES): Add android.texi and input.texi. * doc/emacs/android.texi (Android): Document support for the on-screen keyboard. (Android Startup): Document how to start Emacs with -Q on Android. (Android Environment): Document how Emacs works around the system ``task killer''. Document changes to frame deletion behavior. * doc/emacs/emacs.texi (Top): * doc/emacs/input.texi (Other Input Devices, On-Screen Keyboards): Document how to use Emacs with virtual keyboards. * doc/lispref/commands.texi (Touchscreen Events): Document changes to `touch-screen-track-drag'. * doc/lispref/frames.texi (Frames, On-Screen Keyboards): New node. * java/AndroidManifest.xml.in: Add settings activity and appropriate OSK adjustment mode. * java/org/gnu/emacs/EmacsActivity.java (onCreate): Allow creating Emacs with -Q. (onDestroy): Don't remove if killed by the system. * java/org/gnu/emacs/EmacsContextMenu.java (inflateMenuItems): Fix context menus again. * java/org/gnu/emacs/EmacsNative.java (EmacsNative): Make all event sending functions return long. * java/org/gnu/emacs/EmacsPreferencesActivity.java (EmacsPreferencesActivity): New class. * java/org/gnu/emacs/EmacsService.java (EmacsService) (onStartCommand, onCreate, startEmacsService): Start as a foreground service if necessary to bypass system restrictions. * java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView): * java/org/gnu/emacs/EmacsThread.java (EmacsThread, run): * java/org/gnu/emacs/EmacsView.java (EmacsView, onLayout) (onDetachedFromWindow): * java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, viewLayout): Implement frame resize synchronization.. * java/org/gnu/emacs/EmacsWindowAttachmentManager.java (EmacsWindowAttachmentManager, removeWindowConsumer): Adjust accordingly for changes to frame deletion behavior. * lisp/frame.el (android-toggle-on-screen-keyboard) (frame-toggle-on-screen-keyboard): New function. * lisp/minibuffer.el (minibuffer-setup-on-screen-keyboard) (minibuffer-exit-on-screen-keyboard): New functions. (minibuffer-setup-hook, minibuffer-exit-hook): Add new functions to hooks. * lisp/touch-screen.el (touch-screen-relative-xy): Accept new value of window `frame'. Return frame coordinates in that case. (touch-screen-set-point-commands): New variable. (touch-screen-handle-point-up): Respect that variable. (touch-screen-track-drag): Return `no-drag' where appropriate. (touch-screen-drag-mode-line-1, touch-screen-drag-mode-line): Refactor to use `no-drag'. * src/android.c (struct android_emacs_window): New methods. Make all event sending functions return the event serial. (android_toggle_on_screen_keyboard, android_window_updated): New functions. * src/android.h: Update prototypes. * src/androidfns.c (Fandroid_toggle_on_screen_keyboard) (syms_of_androidfns): New function. * src/androidgui.h (struct android_any_event) (struct android_key_event, struct android_configure_event) (struct android_focus_event, struct android_window_action_event) (struct android_crossing_event, struct android_motion_event) (struct android_button_event, struct android_touch_event) (struct android_wheel_event, struct android_iconify_event) (struct android_menu_event): Add `serial' fields. * src/androidterm.c (handle_one_android_event) (android_frame_up_to_date): * src/androidterm.h (struct android_output): Implement frame resize synchronization.
Diffstat (limited to 'java/AndroidManifest.xml.in')
-rw-r--r--java/AndroidManifest.xml.in12
1 files changed, 12 insertions, 0 deletions
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index b680137a9d0..74f69d2a8e5 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -62,8 +62,10 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
62 android:theme="@android:style/Theme" 62 android:theme="@android:style/Theme"
63 android:debuggable="true" 63 android:debuggable="true"
64 android:extractNativeLibs="true"> 64 android:extractNativeLibs="true">
65
65 <activity android:name="org.gnu.emacs.EmacsActivity" 66 <activity android:name="org.gnu.emacs.EmacsActivity"
66 android:launchMode="singleTop" 67 android:launchMode="singleTop"
68 android:windowSoftInputMode="adjustResize"
67 android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"> 69 android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
68 <intent-filter> 70 <intent-filter>
69 <action android:name="android.intent.action.MAIN" /> 71 <action android:name="android.intent.action.MAIN" />
@@ -73,8 +75,18 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
73 </activity> 75 </activity>
74 76
75 <activity android:name="org.gnu.emacs.EmacsMultitaskActivity" 77 <activity android:name="org.gnu.emacs.EmacsMultitaskActivity"
78 android:windowSoftInputMode="adjustResize"
76 android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"/> 79 android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"/>
77 80
81 <activity android:autoRemoveFromRecents="true"
82 android:label="Emacs options"
83 android:name=".EmacsPreferencesActivity">
84 <intent-filter>
85 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
86 <category android:name="android.intent.category.DEFAULT" />
87 </intent-filter>
88 </activity>
89
78 <service android:name="org.gnu.emacs.EmacsService" 90 <service android:name="org.gnu.emacs.EmacsService"
79 android:directBootAware="false" 91 android:directBootAware="false"
80 android:enabled="true" 92 android:enabled="true"