diff options
| author | Adam Powell <adamp@google.com> | 2011-12-07 18:18:58 -0800 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-12-07 18:18:58 -0800 |
| commit | 243657993c0280771e07a3367d1a7ed45dbfe15f (patch) | |
| tree | 6d3ac2dca6c3307c218a845e92b916dc61ee70a4 /core | |
| parent | 1ba22cc33d0a87154e8ab94b8d4883e4c7083f8c (diff) | |
| parent | db81dc7233c29ab098792924e90bc8aebfb2b408 (diff) | |
| download | frameworks_base-243657993c0280771e07a3367d1a7ed45dbfe15f.zip frameworks_base-243657993c0280771e07a3367d1a7ed45dbfe15f.tar.gz frameworks_base-243657993c0280771e07a3367d1a7ed45dbfe15f.tar.bz2 | |
resolved conflicts for merge of db81dc72 to master
Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 2 | ||||
| -rwxr-xr-x | core/res/res/values/config.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 05c5daa..b455ad5 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -149,7 +149,7 @@ public class ViewConfiguration { * 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. */ - 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 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index c342c20..3ab72f4 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -750,6 +750,6 @@ <!-- Base "touch slop" value used by ViewConfiguration as a movement threshold where scrolling should begin. --> - <dimen name="config_viewConfigurationTouchSlop">4dp</dimen> + <dimen name="config_viewConfigurationTouchSlop">8dp</dimen> </resources> |