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

Commit 2f4e35ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "InputDevice: remove hasButtonUnderPad" into main

parents fccd9100 25e58c3e

include/input/InputDevice.h

+0 −4
Original line number Diff line number Diff line
@@ -329,9 +329,6 @@ public: 
    inline void setHasBattery(bool hasBattery) { mHasBattery = hasBattery; }

    inline bool hasBattery() const { return mHasBattery; }



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

    inline bool hasButtonUnderPad() const { return mHasButtonUnderPad; }



    inline void setHasSensor(bool hasSensor) { mHasSensor = hasSensor; }

    inline bool hasSensor() const { return mHasSensor; }
@@ -371,7 +368,6 @@ private: 


    bool mHasVibrator;

    bool mHasBattery;

    bool mHasButtonUnderPad;

    bool mHasSensor;



    std::vector<MotionRange> mMotionRanges;

libs/input/InputDevice.cpp

+0 −3
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ InputDeviceInfo::InputDeviceInfo(const InputDeviceInfo& other) 
        mEnabled(other.mEnabled),

        mHasVibrator(other.mHasVibrator),

        mHasBattery(other.mHasBattery),

        mHasButtonUnderPad(other.mHasButtonUnderPad),

        mHasSensor(other.mHasSensor),

        mMotionRanges(other.mMotionRanges),

        mSensors(other.mSensors),
@@ -230,7 +229,6 @@ InputDeviceInfo& InputDeviceInfo::operator=(const InputDeviceInfo& other) { 
    mEnabled = other.mEnabled;

    mHasVibrator = other.mHasVibrator;

    mHasBattery = other.mHasBattery;

    mHasButtonUnderPad = other.mHasButtonUnderPad;

    mHasSensor = other.mHasSensor;

    mMotionRanges = other.mMotionRanges;

    mSensors = other.mSensors;
@@ -260,7 +258,6 @@ void InputDeviceInfo::initialize(int32_t id, int32_t generation, int32_t control 
    mEnabled = enabled;

    mHasVibrator = false;

    mHasBattery = false;

    mHasButtonUnderPad = false;

    mHasSensor = false;

    mViewBehavior = viewBehavior;

    mUsiVersion.reset();