diff options
author | Jeff Brown <jeffbrown@android.com> | 2011-05-31 16:03:07 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-31 16:03:07 -0700 |
commit | b530abcff5ae8e5ebb75ec6aa42b7c7c190e98a5 (patch) | |
tree | f5386df4f29aea3a8ef67ee92283590aa3cc6829 /services/input/tests | |
parent | e129509422a17733bf286c8b0c5af28f9cd1643b (diff) | |
parent | 3f5b95b05efcf7ab2e8f193649b841dc1786f2ef (diff) | |
download | frameworks_base-b530abcff5ae8e5ebb75ec6aa42b7c7c190e98a5.zip frameworks_base-b530abcff5ae8e5ebb75ec6aa42b7c7c190e98a5.tar.gz frameworks_base-b530abcff5ae8e5ebb75ec6aa42b7c7c190e98a5.tar.bz2 |
am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit '3f5b95b05efcf7ab2e8f193649b841dc1786f2ef':
Touch pad UX improvements.
Diffstat (limited to 'services/input/tests')
-rw-r--r-- | services/input/tests/InputReader_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/input/tests/InputReader_test.cpp b/services/input/tests/InputReader_test.cpp index 1ab2a3e..78d1db6 100644 --- a/services/input/tests/InputReader_test.cpp +++ b/services/input/tests/InputReader_test.cpp @@ -92,10 +92,10 @@ private: *outY = 0; } - virtual void fade() { + virtual void fade(Transition transition) { } - virtual void unfade() { + virtual void unfade(Transition transition) { } virtual void setPresentation(Presentation presentation) { |