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

am ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev

Browse Source 
* commit 'ac006439bb635cd99d8dcbefe95fa680e21519b5':
  Revert "Revert "Change SurfaceControl setPosition to take floats""
This commit is contained in:
Ramanan Rajeswaran 2013-03-21 15:53:56 +00:00 committed by Android Git Automerger
commit eda14c1bef
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

@ -58,7 +58,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(int32_t x, int32_t y); status_t setPosition(float x, float 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

@ -102,7 +102,7 @@ status_t SurfaceControl::setLayer(int32_t layer) {
const sp<SurfaceComposerClient>& client(mClient); const sp<SurfaceComposerClient>& client(mClient);
return client->setLayer(mHandle, layer); return client->setLayer(mHandle, layer);
} }
status_t SurfaceControl::setPosition(int32_t x, int32_t y) { status_t SurfaceControl::setPosition(float x, float 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);