diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index c24b8b2a5ee3..7c69cfde2b9e 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -201,7 +201,7 @@ public class ScaleGestureDetector { mListener = listener; final ViewConfiguration viewConfiguration = ViewConfiguration.get(context); mSpanSlop = viewConfiguration.getScaledTouchSlop() * 2; - mMinSpan = viewConfiguration.getScaledMinScalingSpan(); + mMinSpan = viewConfiguration.getScaledMinimumScalingSpan(); mHandler = handler; // Quick scale is enabled by default after JB_MR2 final int targetSdkVersion = context.getApplicationInfo().targetSdkVersion; diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index c030ac2a0eb8..81e9c1372aed 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -979,7 +979,7 @@ public class ViewConfiguration { * @throws IllegalStateException if this method is called on a ViewConfiguration that was * instantiated using a constructor with no Context parameter. */ - public int getScaledMinScalingSpan() { + public int getScaledMinimumScalingSpan() { if (!mConstructedWithContext) { throw new IllegalStateException("Min scaling span cannot be determined when this " + "method is called on a ViewConfiguration that was instantiated using a " |