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

Commit fef00db3 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix libinput warnings" am: a4767442 am: a1498868 

am: 35d869c1

Change-Id: I6461ef056bf41d66d391f52cfb25a680dd61b14e
parents 14664fb5 35d869c1

include/input/Input.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -398,7 +398,7 @@ public: 




    inline int32_t getButtonState() const { return mButtonState; }

    inline int32_t getButtonState() const { return mButtonState; }





    inline int32_t setButtonState(int32_t buttonState) { mButtonState = buttonState; }

    inline void setButtonState(int32_t buttonState) { mButtonState = buttonState; }





    inline int32_t getActionButton() const { return mActionButton; }

    inline int32_t getActionButton() const { return mActionButton; }

include/input/InputEventLabels.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -425,30 +425,30 @@ static const char* lookupLabelByValue(int value, const InputEventLabel* list) { 
    return NULL;

    return NULL;

}

}





static int32_t getKeyCodeByLabel(const char* label) {

static inline int32_t getKeyCodeByLabel(const char* label) {

    return int32_t(lookupValueByLabel(label, KEYCODES));

    return int32_t(lookupValueByLabel(label, KEYCODES));

}

}





static const char* getLabelByKeyCode(int32_t keyCode) {

static inline const char* getLabelByKeyCode(int32_t keyCode) {

    if (keyCode >= 0 && keyCode < size(KEYCODES)) {

    if (keyCode >= 0 && keyCode < static_cast<int32_t>(size(KEYCODES))) {

        return KEYCODES[keyCode].literal;

        return KEYCODES[keyCode].literal;

    }

    }

    return NULL;

    return NULL;

}

}





static uint32_t getKeyFlagByLabel(const char* label) {

static inline uint32_t getKeyFlagByLabel(const char* label) {

    return uint32_t(lookupValueByLabel(label, FLAGS));

    return uint32_t(lookupValueByLabel(label, FLAGS));

}

}





static int32_t getAxisByLabel(const char* label) {

static inline int32_t getAxisByLabel(const char* label) {

    return int32_t(lookupValueByLabel(label, AXES));

    return int32_t(lookupValueByLabel(label, AXES));

}

}





static const char* getAxisLabel(int32_t axisId) {

static inline const char* getAxisLabel(int32_t axisId) {

    return lookupLabelByValue(axisId, AXES);

    return lookupLabelByValue(axisId, AXES);

}

}





static int32_t getLedByLabel(const char* label) {

static inline int32_t getLedByLabel(const char* label) {

    return int32_t(lookupValueByLabel(label, LEDS));

    return int32_t(lookupValueByLabel(label, LEDS));

}

}