Fix reporting of key events containing SYM and META

* doc/emacs/android.texi (Android)::(What is Android?):
(Android Startup, Android File System, Android Environment)
(Android Windowing, Android Fonts, Android Troubleshooting):
Improve section titles.
(Android Windowing): Describe the relation between keyboard
modifiers reported by Android and those in key events.
* java/org/gnu/emacs/EmacsWindow.java (onKeyDown, onKeyUp):
Clear META_SYM_ON and META_META_MASK when retrieving ASCII
characters.
* src/androidgui.h: Add ANDROID_META_MASK.
* src/androidterm.c (android_android_to_emacs_modifiers)
(android_emacs_to_android_modifiers): Transform META to Alt, and
vice versa.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index bcb6cd6db45..f74463f88cd 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -365,7 +365,8 @@ android_android_to_emacs_modifiers (struct android_display_info *dpyinfo,
   return (((state & ANDROID_CONTROL_MASK) ? ctrl_modifier  : 0)
           | ((state & ANDROID_SHIFT_MASK) ? shift_modifier : 0)
           | ((state & ANDROID_ALT_MASK)   ? meta_modifier  : 0)
-          | ((state & ANDROID_SUPER_MASK) ? super_modifier : 0));
+          | ((state & ANDROID_SUPER_MASK) ? super_modifier : 0)
+          | ((state & ANDROID_META_MASK)  ? alt_modifier   : 0));
 }
 
 static int
@@ -375,7 +376,8 @@ android_emacs_to_android_modifiers (struct android_display_info *dpyinfo,
   return (((state & ctrl_modifier)    ? ANDROID_CONTROL_MASK : 0)
           | ((state & shift_modifier) ? ANDROID_SHIFT_MASK   : 0)
           | ((state & meta_modifier)  ? ANDROID_ALT_MASK     : 0)
-          | ((state & super_modifier) ? ANDROID_SUPER_MASK   : 0));
+          | ((state & super_modifier) ? ANDROID_SUPER_MASK   : 0)
+          | ((state & alt_modifier)   ? ANDROID_META_MASK    : 0));
 }
 
 static void android_frame_rehighlight (struct android_display_info *);