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

Commit fb5aa6a9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8035399 from 7ee38822 to tm-release 

Change-Id: I991f1482e88834f62e5a463e1ccd99560b5158ee
parents 8da2548c 7ee38822

include/input/Input.h

+2 −3
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ struct PointerCoords { 
    // 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);



    void transform(const ui::Transform& transform);
@@ -572,7 +571,7 @@ public: 


    inline float getYOffset() const { return mTransform.ty(); }



    inline ui::Transform getTransform() const { return mTransform; }

    inline const ui::Transform& getTransform() const { return mTransform; }



    int getSurfaceRotation() const;
@@ -590,7 +589,7 @@ public: 


    void setCursorPosition(float x, float y);



    ui::Transform getRawTransform() const { return mRawTransform; }

    inline const ui::Transform& getRawTransform() const { return mRawTransform; }



    static inline bool isValidCursorPosition(float x, float y) { return !isnan(x) && !isnan(y); }

libs/gui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ cc_library_static { 
    host_supported: true,

    srcs: [

        ":guiconstants_aidl",

        ":inputconstants_aidl",

        "android/gui/DisplayInfo.aidl",

        "android/gui/FocusRequest.aidl",

        "android/gui/InputApplicationInfo.aidl",

libs/gui/SurfaceComposerClient.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,8 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setFlags 
    }

    if ((mask & layer_state_t::eLayerOpaque) || (mask & layer_state_t::eLayerHidden) ||

        (mask & layer_state_t::eLayerSecure) || (mask & layer_state_t::eLayerSkipScreenshot) ||

        (mask & layer_state_t::eEnableBackpressure)) {

        (mask & layer_state_t::eEnableBackpressure) ||

        (mask & layer_state_t::eLayerIsDisplayDecoration)) {

        s->what |= layer_state_t::eFlagsChanged;

    }

    s->flags &= ~mask;

libs/gui/WindowInfo.cpp

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ bool WindowInfo::isSpy() const { 
    return inputFeatures.test(Feature::SPY);

}



bool WindowInfo::interceptsStylus() const {

    return inputFeatures.test(Feature::INTERCEPTS_STYLUS);

}



bool WindowInfo::overlaps(const WindowInfo* other) const {

    return frameLeft < other->frameRight && frameRight > other->frameLeft &&

            frameTop < other->frameBottom && frameBottom > other->frameTop;

libs/gui/include/gui/LayerState.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ struct layer_state_t { 
        // set. This blocks the client until all the buffers have been presented. If the buffers

        // have presentation timestamps, then we may drop buffers.

        eEnableBackpressure = 0x100, // ENABLE_BACKPRESSURE

        eLayerIsDisplayDecoration = 0x200,  // DISPLAY_DECORATION

    };



    enum {