summaryrefslogtreecommitdiffstats
path: root/services/input/tests
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2011-05-25 19:19:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-25 19:19:01 -0700
commit3f5b95b05efcf7ab2e8f193649b841dc1786f2ef (patch)
treeb7e000e79a6205ed7d4ed28e4589a36a4775af64 /services/input/tests
parentfd86ab8a0f15bb15a8c274b8ea61743216f39532 (diff)
parenta4e747445ac0bdd2cc561802c9c7abfedbd0d981 (diff)
downloadframeworks_base-3f5b95b05efcf7ab2e8f193649b841dc1786f2ef.zip
frameworks_base-3f5b95b05efcf7ab2e8f193649b841dc1786f2ef.tar.gz
frameworks_base-3f5b95b05efcf7ab2e8f193649b841dc1786f2ef.tar.bz2
am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit 'a4e747445ac0bdd2cc561802c9c7abfedbd0d981': Touch pad UX improvements.
Diffstat (limited to 'services/input/tests')
-rw-r--r--services/input/tests/InputReader_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/input/tests/InputReader_test.cpp b/services/input/tests/InputReader_test.cpp
index 1596e54..8b3e731 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) {