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

Commit 128e3342 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Input API review." into gingerbread

parents f5ca35e5 b5764e06

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,