ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove unused "layer" argument from show()." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Brown 2012-08-27 17:17:08 -07:00 committed by Android (Google) Code Review
commit 1ae49e3fef
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gui/Surface.h
View File

@ -65,7 +65,7 @@ public:
status_t setPosition(int32_t x, int32_t y);
status_t setSize(uint32_t w, uint32_t h);
status_t hide();
status_t show(int32_t layer = -1);
status_t show();
status_t setFlags(uint32_t flags, uint32_t mask);
status_t setTransparentRegionHint(const Region& transparent);
status_t setAlpha(float alpha=1.0f);

2
include/gui/SurfaceComposerClient.h
View File

@ -100,7 +100,7 @@ public:
static void closeGlobalTransaction(bool synchronous = false);
status_t hide(SurfaceID id);
status_t show(SurfaceID id, int32_t layer = -1);
status_t show(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);

4
libs/gui/Surface.cpp
View File

@ -122,11 +122,11 @@ status_t SurfaceControl::hide() {
const sp<SurfaceComposerClient>& client(mClient);
return client->hide(mToken);
}
status_t SurfaceControl::show(int32_t layer) {
status_t SurfaceControl::show() {
status_t err = validate();
if (err < 0) return err;
const sp<SurfaceComposerClient>& client(mClient);
return client->show(mToken, layer);
return client->show(mToken);
}
status_t SurfaceControl::setFlags(uint32_t flags, uint32_t mask) {
status_t err = validate();

2
libs/gui/SurfaceComposerClient.cpp
View File

@ -479,7 +479,7 @@ status_t SurfaceComposerClient::hide(SurfaceID id) {
layer_state_t::eLayerHidden);
}
status_t SurfaceComposerClient::show(SurfaceID id, int32_t) {
status_t SurfaceComposerClient::show(SurfaceID id) {
return getComposer().setFlags(this, id,
0,
layer_state_t::eLayerHidden);