Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 267e2568 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 65369424: merge from open-source master

Merge commit '65369424cbfbf165b4324bdcb6f138435462a196' into kraken

* commit '65369424cbfbf165b4324bdcb6f138435462a196':
  Add keycodes PageUp and PageDown
parents f507149a 529973ac
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ static const KeycodeLabel KEYCODES[] = {
    { "MEDIA_REWIND", 89 },
    { "MEDIA_FAST_FORWARD", 90 },
    { "MUTE", 91 },
    { "PAGE_UP", 92 },
    { "PAGE_DOWN", 93 },

    // NOTE: If you add a new keycode here you must also add it to:
    //   (enum KeyCode, in this file)
@@ -218,7 +220,9 @@ typedef enum KeyCode {
    kKeyCodePreviousSong = 88,
    kKeyCodeRewind = 89,
    kKeyCodeForward = 90,
    kKeyCodeMute = 91
    kKeyCodeMute = 91,
    kKeyCodePageUp = 92,
    kKeyCodePageDown = 93
} KeyCode;

static const KeycodeLabel FLAGS[] = {