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

Commit 87fab277 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbread 

Merge commit '61cf67a220ba3205737c646c1c836a92074220de'

* commit '61cf67a220ba3205737c646c1c836a92074220de':
  Input API review.
parents 0c8939f4 cb6a0c68

include/ui/EventHub.h

+2 −2
Original line number Diff line number Diff line
@@ -111,10 +111,10 @@ enum { 
    /* The input device is a multi-touch touchscreen. */

    INPUT_DEVICE_CLASS_TOUCHSCREEN_MT= 0x00000010,



    /* The input device is a directional pad. */

    /* The input device is a directional pad (implies keyboard, has DPAD keys). */

    INPUT_DEVICE_CLASS_DPAD          = 0x00000020,



    /* The input device is a gamepad (implies keyboard). */

    /* The input device is a gamepad (implies keyboard, has BUTTON keys). */

    INPUT_DEVICE_CLASS_GAMEPAD       = 0x00000040,



    /* The input device has switches. */

libs/ui/InputReader.cpp

+0 −3
Original line number Diff line number Diff line
@@ -325,9 +325,6 @@ InputDevice* InputReader::createDevice(int32_t deviceId, const String8& name, ui 
    if (classes & INPUT_DEVICE_CLASS_DPAD) {

        keyboardSources |= AINPUT_SOURCE_DPAD;

    }

    if (classes & INPUT_DEVICE_CLASS_GAMEPAD) {

        keyboardSources |= AINPUT_SOURCE_GAMEPAD;

    }



    if (keyboardSources != 0) {

        device->addMapper(new KeyboardInputMapper(device,