Correct earlier changes to processing of Num Lock on Android

* java/org/gnu/emacs/EmacsWindow.java (onKeyDown, onKeyUp):
Cease stripping META_NUM_LOCK_ON and META_SCROLL_LOCK_ON from
meta masks reported to getUnicodeChar.
This commit is contained in:
Po Lu 2024-05-12 14:13:27 +08:00
parent 5b9995052d
commit af6df8e045

View file

@ -691,13 +691,10 @@ private static class Coordinate
state = eventModifiers (event);
/* Num Lock, Scroll Lock and Meta aren't supported by systems older
than Android 3.0. */
/* Meta isn't supported by systems older than Android 3.0. */
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
extra_ignored = (KeyEvent.META_NUM_LOCK_ON
| KeyEvent.META_SCROLL_LOCK_ON
| KeyEvent.META_META_MASK);
extra_ignored = KeyEvent.META_META_MASK;
else
extra_ignored = 0;
@ -748,13 +745,10 @@ private static class Coordinate
/* Compute the event's modifier mask. */
state = eventModifiers (event);
/* Num Lock, Scroll Lock and Meta aren't supported by systems older
than Android 3.0. */
/* Meta isn't supported by systems older than Android 3.0. */
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
extra_ignored = (KeyEvent.META_NUM_LOCK_ON
| KeyEvent.META_SCROLL_LOCK_ON
| KeyEvent.META_META_MASK);
extra_ignored = KeyEvent.META_META_MASK;
else
extra_ignored = 0;