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

Commit f2acf820 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge changes from topic "sfinput4" 

* changes:
  SurfaceFlinger Input: Correct screen magnification.
  Remove inputflinger.rc as init file
  SurfaceFlinger Input: Shrink frame by surfaceInsets.
  InputDispatcher: Notify policy of focus changes.
  Rework InputApplicationInfo
  Replace InputWindowInfo#inputChannel with an IBinder token.
  Add some tests for native input.
  Forward input windows from SurfaceFlinger to InputDispatcher.
parents ae7bd0a6 e07e1031

include/input/IInputFlinger.h

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ public: 
    DECLARE_META_INTERFACE(InputFlinger)



    virtual void setInputWindows(const Vector<InputWindowInfo>& inputHandles) = 0;



    virtual void registerInputChannel(const sp<InputChannel>& channel) = 0;

    virtual void unregisterInputChannel(const sp<InputChannel>& channel) = 0;

};
@@ -46,6 +49,8 @@ class BnInputFlinger : public BnInterface<IInputFlinger> { 
public:

    enum {

        SET_INPUT_WINDOWS_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,

        REGISTER_INPUT_CHANNEL_TRANSACTION,

        UNREGISTER_INPUT_CHANNEL_TRANSACTION

    };



    virtual status_t onTransact(uint32_t code, const Parcel& data,

include/input/Input.h

+7 −2
Original line number Diff line number Diff line
@@ -244,7 +244,12 @@ struct PointerCoords { 
    float getAxisValue(int32_t axis) const;

    status_t setAxisValue(int32_t axis, float value);



    void scale(float scale);

    void scale(float globalScale);



    // Scale the pointer coordinates according to a global scale and a

    // window scale. The global scale will be applied to TOUCH/TOOL_MAJOR/MINOR

    // axes, however the window scaling will not.

    void scale(float globalScale, float windowXScale, float windowYScale);

    void applyOffset(float xOffset, float yOffset);



    inline float getX() const {
@@ -595,7 +600,7 @@ public: 


    void offsetLocation(float xOffset, float yOffset);



    void scale(float scaleFactor);

    void scale(float globalScaleFactor);



    // Apply 3x3 perspective matrix transformation.

    // Matrix is in row-major form and compatible with SkMatrix.

include/input/InputApplication.h

+11 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 


#include <string>



#include <binder/IBinder.h>

#include <binder/Parcel.h>



#include <input/Input.h>

#include <utils/RefBase.h>

#include <utils/Timers.h>
@@ -29,8 +32,12 @@ namespace android { 
 * Describes the properties of an application that can receive input.

 */

struct InputApplicationInfo {

    sp<IBinder> token;

    std::string name;

    nsecs_t dispatchingTimeout;



    status_t write(Parcel& output) const;

    static InputApplicationInfo read(const Parcel& from);

};
@@ -54,6 +61,10 @@ public: 
        return mInfo ? mInfo->dispatchingTimeout : defaultValue;

    }



    inline sp<IBinder> getApplicationToken() const {

        return mInfo ? mInfo->token : nullptr;

    }



    /**

     * Requests that the state of this object be updated to reflect

     * the most current available information about the application.

include/input/InputWindow.h

+37 −8
Original line number Diff line number Diff line
@@ -117,16 +117,41 @@ struct InputWindowInfo { 
        INPUT_FEATURE_DISABLE_USER_ACTIVITY = 0x00000004,

    };

    

    sp<InputChannel> inputChannel;

    /* These values are filled in by the WM and passed through SurfaceFlinger

     * unless specified otherwise.

     */

    sp<IBinder> token;

    std::string name;

    int32_t layoutParamsFlags;

    int32_t layoutParamsType;

    nsecs_t dispatchingTimeout;



    /* These values are filled in by SurfaceFlinger. */

    int32_t frameLeft;

    int32_t frameTop;

    int32_t frameRight;

    int32_t frameBottom;

    float scaleFactor;



    /*

     * SurfaceFlinger consumes this value to shrink the computed frame. This is

     * different from shrinking the touchable region in that it DOES shift the coordinate

     * space where-as the touchable region does not and is more like "cropping". This

     * is used for window shadows.

     */

    int32_t surfaceInset = 0;



    // A global scaling factor for all windows. Unlike windowScaleX/Y this results

    // in scaling of the TOUCH_MAJOR/TOUCH_MINOR axis.

    float globalScaleFactor;



    // Scaling factors applied to individual windows.

    float windowXScale = 1.0f;

    float windowYScale = 1.0f;



    /*

     * This is filled in by the WM relative to the frame and then translated

     * to absolute coordinates by SurfaceFlinger once the frame is computed.

     */

    Region touchableRegion;

    bool visible;

    bool canReceiveKeys;
@@ -138,6 +163,7 @@ struct InputWindowInfo { 
    int32_t ownerUid;

    int32_t inputFeatures;

    int32_t displayId;

    InputApplicationInfo applicationInfo;



    void addTouchableRegion(const Rect& region);
@@ -168,20 +194,23 @@ struct InputWindowInfo { 
 */

class InputWindowHandle : public RefBase {

public:

    const sp<InputApplicationHandle> inputApplicationHandle;



    inline const InputWindowInfo* getInfo() const {

        return &mInfo;

    }



    sp<InputChannel> getInputChannel() const;

    sp<IBinder> getToken() const;



    sp<IBinder> getApplicationToken() {

        return mInfo.applicationInfo.token;

    }



    inline std::string getName() const {

        return mInfo.inputChannel ? mInfo.name : "<invalid>";

        return mInfo.token ? mInfo.name : "<invalid>";

    }



    inline nsecs_t getDispatchingTimeout(nsecs_t defaultValue) const {

        return mInfo.inputChannel? mInfo.dispatchingTimeout : defaultValue;

        return mInfo.token ? mInfo.dispatchingTimeout : defaultValue;

    }



    /**
@@ -202,7 +231,7 @@ public: 
    void releaseChannel();



protected:

    explicit InputWindowHandle(const sp<InputApplicationHandle>& inputApplicationHandle);

    explicit InputWindowHandle();

    virtual ~InputWindowHandle();



    InputWindowInfo mInfo;

libs/gui/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ cc_test { 
        "BufferItemConsumer_test.cpp",

        "BufferQueue_test.cpp",

        "CpuConsumer_test.cpp",

        "EndToEndNativeInputTest.cpp",

        "FillBuffer.cpp",

        "GLTest.cpp",

        "IGraphicBufferProducer_test.cpp",