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

Commit 960259f4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread 

Merge commit '75a91389f1938214397aaee262f4136e6bb6b094' into gingerbread-plus-aosp

* commit '75a91389f1938214397aaee262f4136e6bb6b094':
  Implement native key pre-dispatching to IMEs.
parents 36930c22 9c48c34e

include/ui/Input.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,7 @@ public: 
    

    

protected:

protected:

    void initialize(int32_t deviceId, int32_t source);

    void initialize(int32_t deviceId, int32_t source);

    void initialize(const InputEvent& from);





private:

private:

    int32_t mDeviceId;

    int32_t mDeviceId;
@@ -202,6 +203,7 @@ public: 
            int32_t repeatCount,

            int32_t repeatCount,

            nsecs_t downTime,

            nsecs_t downTime,

            nsecs_t eventTime);

            nsecs_t eventTime);

    void initialize(const KeyEvent& from);





private:

private:

    int32_t mAction;

    int32_t mAction;

libs/ui/Input.cpp

+17 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,11 @@ void InputEvent::initialize(int32_t deviceId, int32_t source) { 
    mSource = source;

    mSource = source;

}

}





void InputEvent::initialize(const InputEvent& from) {

    mDeviceId = from.mDeviceId;

    mSource = from.mSource;

}



// class KeyEvent

// class KeyEvent





bool KeyEvent::hasDefaultAction(int32_t keyCode) {

bool KeyEvent::hasDefaultAction(int32_t keyCode) {
@@ -106,6 +111,18 @@ void KeyEvent::initialize( 
    mEventTime = eventTime;

    mEventTime = eventTime;

}

}





void KeyEvent::initialize(const KeyEvent& from) {

    InputEvent::initialize(from);

    mAction = from.mAction;

    mFlags = from.mFlags;

    mKeyCode = from.mKeyCode;

    mScanCode = from.mScanCode;

    mMetaState = from.mMetaState;

    mRepeatCount = from.mRepeatCount;

    mDownTime = from.mDownTime;

    mEventTime = from.mEventTime;

}



// class MotionEvent

// class MotionEvent





void MotionEvent::initialize(

void MotionEvent::initialize(