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

Revert "Change SurfaceControl setPosition to take floats"

Browse Source 
Temporary, to fix weekend build, until we get Nvidia code drop.

This reverts commit 9a867a8798

DO NOT MERGE

Change-Id: I7b5dbc4db46ef3d97dc8598057d5487d6971178b
This commit is contained in:
Dave Burke 2013-03-01 20:39:03 +00:00 committed by Guang Zhu
parent 98ca63e6d1
commit bbb57f3331
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gui/SurfaceControl.h
View File

@ -57,7 +57,7 @@ public:
status_t setLayerStack(int32_t layerStack); status_t setLayerStack(int32_t layerStack);
status_t setLayer(int32_t layer); status_t setLayer(int32_t layer);
status_t setPosition(float x, float y); status_t setPosition(int32_t x, int32_t y);
status_t setSize(uint32_t w, uint32_t h); status_t setSize(uint32_t w, uint32_t h);
status_t hide(); status_t hide();
status_t show(); status_t show();

2
libs/gui/SurfaceControl.cpp
View File

@ -106,7 +106,7 @@ status_t SurfaceControl::setLayer(int32_t layer) {
const sp<SurfaceComposerClient>& client(mClient); const sp<SurfaceComposerClient>& client(mClient);
return client->setLayer(mSurface, layer); return client->setLayer(mSurface, layer);
} }
status_t SurfaceControl::setPosition(float x, float y) { status_t SurfaceControl::setPosition(int32_t x, int32_t y) {
status_t err = validate(); status_t err = validate();
if (err < 0) return err; if (err < 0) return err;
const sp<SurfaceComposerClient>& client(mClient); const sp<SurfaceComposerClient>& client(mClient);