aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml
diff options
context:
space:
mode:
authorPo Lu2023-05-26 15:20:39 +0800
committerPo Lu2023-05-26 15:20:39 +0800
commit0eb1f4e57125117006f109a5549082008fc9fbb1 (patch)
tree12fdeab1893c34654b31cb3ad5efae188d08e405 /java/res/xml
parentddaca337e3a81e811de6e0f61ed78c414a1986be (diff)
downloademacs-0eb1f4e57125117006f109a5549082008fc9fbb1.tar.gz
emacs-0eb1f4e57125117006f109a5549082008fc9fbb1.zip
Allow starting Emacs --debug-init on Android
* doc/emacs/android.texi (Android Troubleshooting): Document `debug-init' option. * java/AndroidManifest.xml.in (EmacsLauncherPreferencesActivity): New activity. Export on systems older than Android 7.0. * java/org/gnu/emacs/EmacsActivity.java (onCreate): Adjust for string startup argument. * java/org/gnu/emacs/EmacsLauncherPreferencesActivity.java: New file. * java/org/gnu/emacs/EmacsPreferencesActivity.java (EmacsPreferencesActivity): Don't make final. (startEmacsQ): Give start-up argument as an argument, not as a boolean. (startEmacsDebugInit): New function. (onCreate): Register new listener; make final. * java/org/gnu/emacs/EmacsService.java (onCreate): Pass extraStartupArgument. * java/org/gnu/emacs/EmacsThread.java (EmacsThread): Rename startDashQ to extraStartupArgument. (run): Adjust accordingly. * java/res/values-v24/bool.xml: * java/res/values/bool.xml: * java/res/values/strings.xml: New files. * java/res/xml/preferences.xml: Add new option. Move string resources around.
Diffstat (limited to 'java/res/xml')
-rw-r--r--java/res/xml/preferences.xml12
1 files changed, 7 insertions, 5 deletions
diff --git a/java/res/xml/preferences.xml b/java/res/xml/preferences.xml
index f0c3abb52e7..d52d28816e5 100644
--- a/java/res/xml/preferences.xml
+++ b/java/res/xml/preferences.xml
@@ -19,10 +19,12 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
19 19
20<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> 20<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
21 <Preference android:key="start_quick" 21 <Preference android:key="start_quick"
22 android:title="Restart Emacs with -Q" 22 android:title="@string/start_quick_title"
23 android:summary="Restart Emacs, but do not load site lisp or init files."/> 23 android:summary="@string/start_quick_caption"/>
24 24 <Preference android:key="start_debug_init"
25 android:title="@string/start_debug_init_title"
26 android:summary="@string/start_debug_init_caption"/>
25 <Preference android:key="erase_dump" 27 <Preference android:key="erase_dump"
26 android:title="Delete dump file" 28 android:title="@string/erase_dump_title"
27 android:summary="Remove the dumped state created when Emacs was installed"/> 29 android:summary="@string/erase_dump_caption"/>
28</PreferenceScreen> 30</PreferenceScreen>