diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-09 19:00:59 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-05-09 19:00:59 -0700 |
| commit | aa9d84c37e05f696ec158dac98ce38cf41e18314 (patch) | |
| tree | 49a8e08d51840eec7ff20b624c59408f2f7523aa /include/ui | |
| parent | 28e77e616d8f005c8e07d6f28a83f8ca9772aedf (diff) | |
| parent | 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a (diff) | |
| download | frameworks_base-aa9d84c37e05f696ec158dac98ce38cf41e18314.zip frameworks_base-aa9d84c37e05f696ec158dac98ce38cf41e18314.tar.gz frameworks_base-aa9d84c37e05f696ec158dac98ce38cf41e18314.tar.bz2 | |
resolved conflicts for merge of 05be6d6f to master
Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/Input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ui/Input.h b/include/ui/Input.h index 9b92c73..c7ebf56 100644 --- a/include/ui/Input.h +++ b/include/ui/Input.h @@ -216,6 +216,8 @@ struct PointerCoords { status_t setAxisValue(int32_t axis, float value); float* editAxisValue(int32_t axis); + void scale(float scale); + #ifdef HAVE_ANDROID_OS status_t readFromParcel(Parcel* parcel); status_t writeToParcel(Parcel* parcel) const; |