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

This commit is contained in:
Ramanan Rajeswaran 2013-03-21 15:52:48 +00:00 committed by Android (Google) Code Review
commit ac006439bb
2 changed files with 2 additions and 2 deletions

View File

@ -58,7 +58,7 @@ public:
status_t setLayerStack(int32_t layerStack);
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 hide();
status_t show();

View File

@ -102,7 +102,7 @@ status_t SurfaceControl::setLayer(int32_t layer) {
const sp<SurfaceComposerClient>& client(mClient);
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();
if (err < 0) return err;
const sp<SurfaceComposerClient>& client(mClient);