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

Commit 9b83cce2 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am df02df11: am 307ed31c: Merge "Remove incomplete input device enumeration... 

am df02df11: am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread

Merge commit 'df02df115a594553b3ebaa95a0a7f7185a8787d3'

* commit 'df02df115a594553b3ebaa95a0a7f7185a8787d3':
  Remove incomplete input device enumeration NDK API.
parents f36e8e82 006f136d

include/ui/Input.h

+0 −23
Original line number Diff line number Diff line
@@ -466,29 +466,6 @@ private: 
    KeyedVector<int32_t, MotionRange> mMotionRanges;

};



/*

 * Provides remote access to information about an input device.

 *

 * Note: This is essentially a wrapper for Binder calls into the Window Manager Service.

 */

class InputDeviceProxy : public RefBase, public AInputDevice {

protected:

    InputDeviceProxy();

    virtual ~InputDeviceProxy();



public:

    static void getDeviceIds(Vector<int32_t>& outIds);



    static sp<InputDeviceProxy> getDevice(int32_t id);



    inline const InputDeviceInfo* getInfo() { return & mInfo; }



    // TODO add hasKeys, keymap, etc...



private:

    InputDeviceInfo mInfo;

};





} // namespace android

libs/ui/Input.cpp

+0 −17
Original line number Diff line number Diff line
@@ -210,21 +210,4 @@ void InputDeviceInfo::addMotionRange(int32_t rangeType, const MotionRange& range 
    mMotionRanges.add(rangeType, range);

}



// class InputDeviceProxy



InputDeviceProxy::InputDeviceProxy() {

}



InputDeviceProxy::~InputDeviceProxy() {

}



void InputDeviceProxy::getDeviceIds(Vector<int32_t>& outIds) {

    // TODO use Binder

}



sp<InputDeviceProxy> InputDeviceProxy::getDevice(int32_t id) {

    // TODO use Binder

    return NULL;

}



} // namespace android