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

Commit 2f78b68c authored by Michael Wright's avatar Michael Wright
Browse files

Add new AINPUT_SOURCE_BLUETOOTH_STYLUS 

Bug: 21531826
Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
parent 8a4222a6

include/android/input.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -453,6 +453,7 @@ enum { 
    AINPUT_SOURCE_TOUCHSCREEN = 0x00001000 | AINPUT_SOURCE_CLASS_POINTER,

    AINPUT_SOURCE_TOUCHSCREEN = 0x00001000 | AINPUT_SOURCE_CLASS_POINTER,

    AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,

    AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,

    AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,

    AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,

    AINPUT_SOURCE_BLUETOOTH_STYLUS = 0x00008000 | AINPUT_SOURCE_STYLUS,

    AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,

    AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,

    AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,

    AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,

    AINPUT_SOURCE_TOUCH_NAVIGATION = 0x00200000 | AINPUT_SOURCE_CLASS_NONE,

    AINPUT_SOURCE_TOUCH_NAVIGATION = 0x00200000 | AINPUT_SOURCE_CLASS_NONE,

services/inputflinger/InputReader.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -3104,9 +3104,12 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { 
            && mParameters.hasAssociatedDisplay) {

            && mParameters.hasAssociatedDisplay) {

        mSource = AINPUT_SOURCE_TOUCHSCREEN;

        mSource = AINPUT_SOURCE_TOUCHSCREEN;

        mDeviceMode = DEVICE_MODE_DIRECT;

        mDeviceMode = DEVICE_MODE_DIRECT;

        if (hasStylus() || hasExternalStylus()) {

        if (hasStylus()) {

            mSource |= AINPUT_SOURCE_STYLUS;

            mSource |= AINPUT_SOURCE_STYLUS;

        }

        }

        if (hasExternalStylus()) {

            mSource |= AINPUT_SOURCE_BLUETOOTH_STYLUS;

        }

    } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) {

    } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) {

        mSource = AINPUT_SOURCE_TOUCH_NAVIGATION;

        mSource = AINPUT_SOURCE_TOUCH_NAVIGATION;

        mDeviceMode = DEVICE_MODE_NAVIGATION;

        mDeviceMode = DEVICE_MODE_NAVIGATION;