Merged "Adjust mBiggerTouchSlopSquare to the suitable value"

Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e

diff --cc api/current.xml
Simple merge

diff --cc core/java/android/view/ViewConfiguration.java
index 739758c,5397449..2a74eb7
mode 100644,100755..100755
--- 1/core/java/android/view/ViewConfiguration.java
--- 2/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@@ -239,10 -213,11 +247,11 @@@ public class ViewConfiguration 
          mMinimumFlingVelocity = (int) (density * MINIMUM_FLING_VELOCITY + 0.5f);
          mMaximumFlingVelocity = (int) (density * MAXIMUM_FLING_VELOCITY + 0.5f);
          mScrollbarSize = (int) (density * SCROLL_BAR_SIZE + 0.5f);
 -        mTouchSlop = (int) (density * TOUCH_SLOP + 0.5f);
 -        mLargeTouchSlop =  (int) (density * LARGE_TOUCH_SLOP + 0.5f);
 -        mPagingTouchSlop = (int) (density * PAGING_TOUCH_SLOP + 0.5f);
 -        mDoubleTapSlop = (int) (density * DOUBLE_TAP_SLOP + 0.5f);
 -        mWindowTouchSlop = (int) (density * WINDOW_TOUCH_SLOP + 0.5f);
 +        mTouchSlop = (int) (sizeAndDensity * TOUCH_SLOP + 0.5f);
++        mLargeTouchSlop =  (int) (sizeAndDensity * LARGE_TOUCH_SLOP + 0.5f);
 +        mPagingTouchSlop = (int) (sizeAndDensity * PAGING_TOUCH_SLOP + 0.5f);
 +        mDoubleTapSlop = (int) (sizeAndDensity * DOUBLE_TAP_SLOP + 0.5f);
 +        mWindowTouchSlop = (int) (sizeAndDensity * WINDOW_TOUCH_SLOP + 0.5f);
  
          // Size of the screen in bytes, in ARGB_8888 format
          mMaximumDrawingCacheSize = 4 * metrics.widthPixels * metrics.heightPixels;