diff options
| author | Ramanan Rajeswaran <ramanan@google.com> | 2013-03-21 15:52:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-21 15:52:49 +0000 |
| commit | ac006439bb635cd99d8dcbefe95fa680e21519b5 (patch) | |
| tree | 9a26cdd156e4440664508f0a3fc20f797d988399 | |
| parent | 7c1a487ba8c0a3b591a77e2ddcb33ef9bdfaff64 (diff) | |
| parent | d6480c020b050c777ec1db2dd9c16fccfc47b47b (diff) | |
| download | frameworks_native-ac006439bb635cd99d8dcbefe95fa680e21519b5.zip frameworks_native-ac006439bb635cd99d8dcbefe95fa680e21519b5.tar.gz frameworks_native-ac006439bb635cd99d8dcbefe95fa680e21519b5.tar.bz2 | |
Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
| -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 fe8eb6f..f27754c 100644 --- a/include/gui/SurfaceControl.h +++ b/include/gui/SurfaceControl.h @@ -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(); diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp index bb57948..f4e88f5 100644 --- a/libs/gui/SurfaceControl.cpp +++ b/libs/gui/SurfaceControl.cpp @@ -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); |