diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-06-07 17:48:39 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-06-07 17:48:39 -0700 |
| commit | 774ed9d9537c15482e8baca2f2890c5d2f4ffe75 (patch) | |
| tree | a22195f0a2d7e97ce86126610a0ece0d9f579460 /services/java | |
| parent | f5969553727e7a9058820291439403bb3f9b327f (diff) | |
| parent | 8b2c00144ac262a6fbdbbac1ed8dfe813b883f81 (diff) | |
| download | frameworks_base-774ed9d9537c15482e8baca2f2890c5d2f4ffe75.zip frameworks_base-774ed9d9537c15482e8baca2f2890c5d2f4ffe75.tar.gz frameworks_base-774ed9d9537c15482e8baca2f2890c5d2f4ffe75.tar.bz2 | |
resolved conflicts for merge of 8b2c0014 to master
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
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 3095c37..ee69311 100644 --- a/services/java/com/android/server/wm/InputManager.java +++ b/services/java/com/android/server/wm/InputManager.java @@ -617,8 +617,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") @@ -632,11 +637,6 @@ public class InputManager { } @SuppressWarnings("unused") - public int getTouchSlop() { - return ViewConfiguration.get(mContext).getScaledTouchSlop(); - } - - @SuppressWarnings("unused") public int getMaxEventsPerSecond() { int result = 0; try { |