Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of db81dc72 to master

Browse Source 
Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444
This commit is contained in:
Adam Powell
2011-12-07 18:18:58 -08:00
parent 1ba22cc33d db81dc7233
commit 243657993c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ViewConfiguration.java
View File

@@ -149,7 +149,7 @@ public class ViewConfiguration {
* It may be appropriate to tweak this on a device-specific basis in an overlay based on * It may be appropriate to tweak this on a device-specific basis in an overlay based on
* the characteristics of the touch panel and firmware. * the characteristics of the touch panel and firmware.
*/ */
private static final int TOUCH_SLOP = 4; private static final int TOUCH_SLOP = 8;
/** /**
* Distance the first touch can wander before we stop considering this event a double tap * Distance the first touch can wander before we stop considering this event a double tap

2
core/res/res/values/config.xml
View File

@@ -750,6 +750,6 @@
<!-- Base "touch slop" value used by ViewConfiguration as a <!-- Base "touch slop" value used by ViewConfiguration as a
movement threshold where scrolling should begin. --> movement threshold where scrolling should begin. -->
<dimen name="config_viewConfigurationTouchSlop">4dp</dimen> <dimen name="config_viewConfigurationTouchSlop">8dp</dimen>
</resources> </resources>