diff options
| author | Ramanan Rajeswaran <ramanan@google.com> | 2013-03-21 15:49:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-21 15:49:59 +0000 |
| commit | d6480c020b050c777ec1db2dd9c16fccfc47b47b (patch) | |
| tree | ac85cc789d0b67e3c144063dbe521b995a494253 | |
| parent | bbb57f3331c7182399ed82e9c4f93a965677dde3 (diff) | |
| download | frameworks_native-d6480c020b050c777ec1db2dd9c16fccfc47b47b.zip frameworks_native-d6480c020b050c777ec1db2dd9c16fccfc47b47b.tar.gz frameworks_native-d6480c020b050c777ec1db2dd9c16fccfc47b47b.tar.bz2 | |
Revert "Revert "Change SurfaceControl setPosition to take floats""
This reverts commit bbb57f3331c7182399ed82e9c4f93a965677dde3
Change-Id: Ib8f039f530d6b8175b5205c6c0008b135d4001a2
| -rw-r--r-- | include/gui/SurfaceControl.h | 2 | ||||
| -rw-r--r-- | libs/gui/SurfaceControl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gui/SurfaceControl.h b/include/gui/SurfaceControl.h index f70888d..9268e7d 100644 --- a/include/gui/SurfaceControl.h +++ b/include/gui/SurfaceControl.h @@ -57,7 +57,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(); diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp index ef52269..e621b22 100644 --- a/libs/gui/SurfaceControl.cpp +++ b/libs/gui/SurfaceControl.cpp @@ -106,7 +106,7 @@ status_t SurfaceControl::setLayer(int32_t layer) { const sp<SurfaceComposerClient>& client(mClient); return client->setLayer(mSurface, 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); |