diff options
author | Jeff Brown <jeffbrown@android.com> | 2011-06-06 20:34:38 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 20:34:38 -0700 |
commit | 8b2c00144ac262a6fbdbbac1ed8dfe813b883f81 (patch) | |
tree | 44a649adea82169ad9659e51b9f0e4306b28433a /services/java | |
parent | 5e4d0206486378ffc7d2992750e439d54df15147 (diff) | |
parent | b3536145725250401d25ffa00cda85d222dfc21e (diff) | |
download | frameworks_base-8b2c00144ac262a6fbdbbac1ed8dfe813b883f81.zip frameworks_base-8b2c00144ac262a6fbdbbac1ed8dfe813b883f81.tar.gz frameworks_base-8b2c00144ac262a6fbdbbac1ed8dfe813b883f81.tar.bz2 |
am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
* commit 'b3536145725250401d25ffa00cda85d222dfc21e':
Touch pad improvements. Bug: 4124987
Diffstat (limited to 'services/java')
-rw-r--r-- | services/java/com/android/server/wm/InputManager.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/services/java/com/android/server/wm/InputManager.java b/services/java/com/android/server/wm/InputManager.java index 4eda684..3b01217 100644 --- a/services/java/com/android/server/wm/InputManager.java +++ b/services/java/com/android/server/wm/InputManager.java @@ -540,8 +540,13 @@ public class InputManager { } @SuppressWarnings("unused") - public int getTapTimeout() { - return ViewConfiguration.getTapTimeout(); + public int getHoverTapTimeout() { + return ViewConfiguration.getHoverTapTimeout(); + } + + @SuppressWarnings("unused") + public int getHoverTapSlop() { + return ViewConfiguration.getHoverTapSlop(); } @SuppressWarnings("unused") @@ -555,11 +560,6 @@ public class InputManager { } @SuppressWarnings("unused") - public int getTouchSlop() { - return ViewConfiguration.get(mContext).getScaledTouchSlop(); - } - - @SuppressWarnings("unused") public int getMaxEventsPerSecond() { int result = 0; try { |