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

Commit ed42665a authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am ff164b69: am 2aee1b01: Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev 

* commit 'ff164b69':
  Add TOUCH_NAVIGATION input source
parents 6d74bd6a ff164b69

include/android/input.h

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ enum { 
enum {

    AINPUT_SOURCE_CLASS_MASK = 0x000000ff,



    AINPUT_SOURCE_CLASS_NONE = 0x00000000,

    AINPUT_SOURCE_CLASS_BUTTON = 0x00000001,

    AINPUT_SOURCE_CLASS_POINTER = 0x00000002,

    AINPUT_SOURCE_CLASS_NAVIGATION = 0x00000004,
@@ -446,6 +447,7 @@ enum { 
    AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,

    AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,

    AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,

    AINPUT_SOURCE_TOUCH_NAVIGATION = 0x00200000 | AINPUT_SOURCE_CLASS_NONE,

    AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,



    AINPUT_SOURCE_ANY = 0xffffff00,