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

Commit fefad436 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Remove freeze(), unfreeze() and setFreezeTint()."

parents 74bf0721 6501e994

include/gui/ISurfaceComposer.h

+0 −2
Original line number Diff line number Diff line
@@ -66,13 +66,11 @@ public: 
        eMatrixChanged              = 0x00000010,

        eTransparentRegionChanged   = 0x00000020,

        eVisibilityChanged          = 0x00000040,

        eFreezeTintChanged          = 0x00000080,

        eCropChanged                = 0x00000100,

    };



    enum {

        eLayerHidden        = 0x01,

        eLayerFrozen        = 0x02,

        eLayerDither        = 0x04,

        eLayerFilter        = 0x08,

        eLayerBlurFreeze    = 0x10

include/gui/Surface.h

+0 −3
Original line number Diff line number Diff line
@@ -65,13 +65,10 @@ public: 
    status_t    setSize(uint32_t w, uint32_t h);

    status_t    hide();

    status_t    show(int32_t layer = -1);

    status_t    freeze();

    status_t    unfreeze();

    status_t    setFlags(uint32_t flags, uint32_t mask);

    status_t    setTransparentRegionHint(const Region& transparent);

    status_t    setAlpha(float alpha=1.0f);

    status_t    setMatrix(float dsdx, float dtdx, float dsdy, float dtdy);

    status_t    setFreezeTint(uint32_t tint);

    status_t    setCrop(const Rect& crop);



    static status_t writeSurfaceToParcel(

include/gui/SurfaceComposerClient.h

+0 −3
Original line number Diff line number Diff line
@@ -111,13 +111,10 @@ public: 


    status_t    hide(SurfaceID id);

    status_t    show(SurfaceID id, int32_t layer = -1);

    status_t    freeze(SurfaceID id);

    status_t    unfreeze(SurfaceID id);

    status_t    setFlags(SurfaceID id, uint32_t flags, uint32_t mask);

    status_t    setTransparentRegionHint(SurfaceID id, const Region& transparent);

    status_t    setLayer(SurfaceID id, int32_t layer);

    status_t    setAlpha(SurfaceID id, float alpha=1.0f);

    status_t    setFreezeTint(SurfaceID id, uint32_t tint);

    status_t    setMatrix(SurfaceID id, float dsdx, float dtdx, float dsdy, float dtdy);

    status_t    setPosition(SurfaceID id, float x, float y);

    status_t    setSize(SurfaceID id, uint32_t w, uint32_t h);

include/private/gui/LayerState.h

+1 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct layer_state_t { 
    layer_state_t()

        :   surface(0), what(0),

            x(0), y(0), z(0), w(0), h(0),

            alpha(0), tint(0), flags(0), mask(0),

            alpha(0), flags(0), mask(0),

            reserved(0)

    {

        matrix.dsdx = matrix.dtdy = 1.0f;
@@ -61,7 +61,6 @@ struct layer_state_t { 
            uint32_t        w;

            uint32_t        h;

            float           alpha;

            uint32_t        tint;

            uint8_t         flags;

            uint8_t         mask;

            uint8_t         reserved;

libs/gui/Surface.cpp

+0 −18
Original line number Diff line number Diff line
@@ -122,18 +122,6 @@ status_t SurfaceControl::show(int32_t layer) { 
    const sp<SurfaceComposerClient>& client(mClient);

    return client->show(mToken, layer);

}

status_t SurfaceControl::freeze() {

    status_t err = validate();

    if (err < 0) return err;

    const sp<SurfaceComposerClient>& client(mClient);

    return client->freeze(mToken);

}

status_t SurfaceControl::unfreeze() {

    status_t err = validate();

    if (err < 0) return err;

    const sp<SurfaceComposerClient>& client(mClient);

    return client->unfreeze(mToken);

}

status_t SurfaceControl::setFlags(uint32_t flags, uint32_t mask) {

    status_t err = validate();

    if (err < 0) return err;
@@ -158,12 +146,6 @@ status_t SurfaceControl::setMatrix(float dsdx, float dtdx, float dsdy, float dtd 
    const sp<SurfaceComposerClient>& client(mClient);

    return client->setMatrix(mToken, dsdx, dtdx, dsdy, dtdy);

}

status_t SurfaceControl::setFreezeTint(uint32_t tint) {

    status_t err = validate();

    if (err < 0) return err;

    const sp<SurfaceComposerClient>& client(mClient);

    return client->setFreezeTint(mToken, tint);

}

status_t SurfaceControl::setCrop(const Rect& crop) {

    status_t err = validate();

    if (err < 0) return err;