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

Commit e5bb2a45 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Add input device property for buttons under touchpads"

parents 1962f651 931fd6de

include/input/InputDevice.h

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ public: 
    inline void setVibrator(bool hasVibrator) { mHasVibrator = hasVibrator; }

    inline bool hasVibrator() const { return mHasVibrator; }



    inline void setButtonUnderPad(bool hasButton) { mHasButtonUnderPad = hasButton; }

    inline bool hasButtonUnderPad() const { return mHasButtonUnderPad; }



    inline const Vector<MotionRange>& getMotionRanges() const {

        return mMotionRanges;

    }
@@ -115,6 +118,7 @@ private: 
    int32_t mKeyboardType;

    sp<KeyCharacterMap> mKeyCharacterMap;

    bool mHasVibrator;

    bool mHasButtonUnderPad;



    Vector<MotionRange> mMotionRanges;

};

libs/input/InputDevice.cpp

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ InputDeviceInfo::InputDeviceInfo(const InputDeviceInfo& other) : 
        mKeyboardType(other.mKeyboardType),

        mKeyCharacterMap(other.mKeyCharacterMap),

        mHasVibrator(other.mHasVibrator),

        mHasButtonUnderPad(other.mHasButtonUnderPad),

        mMotionRanges(other.mMotionRanges) {

}
@@ -152,6 +153,7 @@ void InputDeviceInfo::initialize(int32_t id, int32_t generation, 
    mSources = 0;

    mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE;

    mHasVibrator = false;

    mHasButtonUnderPad = false;

    mMotionRanges.clear();

}