diff options
| author | 2024-01-04 19:34:16 +0000 | |
|---|---|---|
| committer | 2024-01-04 19:34:16 +0000 | |
| commit | 8879f3f84808a9ff08936b645eab5d4d43812ca8 (patch) | |
| tree | 1fa07c901495cb3eb2da806fea9128d9dffa6d28 | |
| parent | 0b21a7310e105e6a5531e149fdc369c13669da5e (diff) | |
| parent | bd9782b38f7b671a3c4a308b1a1260992bcb7f7d (diff) | |
Merge "Mark stylus buttons mapppings as fallback" into main am: f45ca2ce2d am: bd9782b38f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2896380
Change-Id: I455ec2cad7d901613c7f370aca2878fd8f0afd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | data/keyboards/Generic.kl | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/data/keyboards/Generic.kl b/data/keyboards/Generic.kl index 31092536bac5..51b720ddb758 100644 --- a/data/keyboards/Generic.kl +++ b/data/keyboards/Generic.kl @@ -430,19 +430,17 @@ key 658 MACRO_3 key 659 MACRO_4 # Keys defined by HID usages -key usage 0x0c0067 WINDOW -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN -key usage 0x0c0079 KEYBOARD_BACKLIGHT_UP -key usage 0x0c007A KEYBOARD_BACKLIGHT_DOWN -key usage 0x0c007C KEYBOARD_BACKLIGHT_TOGGLE -key usage 0x0c0173 MEDIA_AUDIO_TRACK -key usage 0x0c019C PROFILE_SWITCH -key usage 0x0c01A2 ALL_APPS -# TODO(b/297094448): Add stylus button mappings as a fallback when we have a way to determine -# if a device can actually report it. -# key usage 0x0d0044 STYLUS_BUTTON_PRIMARY -# key usage 0x0d005a STYLUS_BUTTON_SECONDARY +key usage 0x0c0067 WINDOW FALLBACK_USAGE_MAPPING +key usage 0x0c006F BRIGHTNESS_UP FALLBACK_USAGE_MAPPING +key usage 0x0c0070 BRIGHTNESS_DOWN FALLBACK_USAGE_MAPPING +key usage 0x0c0079 KEYBOARD_BACKLIGHT_UP FALLBACK_USAGE_MAPPING +key usage 0x0c007A KEYBOARD_BACKLIGHT_DOWN FALLBACK_USAGE_MAPPING +key usage 0x0c007C KEYBOARD_BACKLIGHT_TOGGLE FALLBACK_USAGE_MAPPING +key usage 0x0c0173 MEDIA_AUDIO_TRACK FALLBACK_USAGE_MAPPING +key usage 0x0c019C PROFILE_SWITCH FALLBACK_USAGE_MAPPING +key usage 0x0c01A2 ALL_APPS FALLBACK_USAGE_MAPPING +key usage 0x0d0044 STYLUS_BUTTON_PRIMARY FALLBACK_USAGE_MAPPING +key usage 0x0d005a STYLUS_BUTTON_SECONDARY FALLBACK_USAGE_MAPPING # Joystick and game controller axes. # Axes that are not mapped will be assigned generic axis numbers by the input subsystem. |