summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/wm/InputManager.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2011-06-06 20:30:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-06 20:30:47 -0700
commited48fa89a8e31b04681347a9235c2a566e7dbb8e (patch)
tree7f263849b561d892ddbf422a5ffeca34d0f7bff0 /services/java/com/android/server/wm/InputManager.java
parentc1830a77a7fe0f1ccd52f405cb076d40fe085e2f (diff)
parentbb3fcba0caf697f1d238a2cbefdf1efe06eded99 (diff)
downloadframeworks_base-ed48fa89a8e31b04681347a9235c2a566e7dbb8e.zip
frameworks_base-ed48fa89a8e31b04681347a9235c2a566e7dbb8e.tar.gz
frameworks_base-ed48fa89a8e31b04681347a9235c2a566e7dbb8e.tar.bz2
Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
Diffstat (limited to 'services/java/com/android/server/wm/InputManager.java')
-rw-r--r--services/java/com/android/server/wm/InputManager.java14
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 {