Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24365799 authored by Adam Powell's avatar Adam Powell
Browse files

resolved conflicts for merge of db81dc72 to master 

Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444
parents 1ba22cc3 db81dc72

core/java/android/view/ViewConfiguration.java

+1 −1
Original line number Diff line number Diff line
@@ -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

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>