From 192c63563229687169ffda742047cb82efd62561 Mon Sep 17 00:00:00 2001
From: shepshapard <shepshapard@google.com>
Date: Tue, 26 Feb 2019 11:05:46 -0800
Subject: [PATCH] getScaledMinScalingSpan -> getScaledMinimum...

Fixes: 126376129
Test: android.view.cts.ViewConfigurationTest

Change-Id: Ie5ac265bb8a390d9b82a61cac32ac1dc02556eb7
---
 api/current.txt                                  | 2 +-
 core/java/android/view/ScaleGestureDetector.java | 2 +-
 core/java/android/view/ViewConfiguration.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index bf73b7a97adbc..53cbcd461a428 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -51205,8 +51205,8 @@ package android.view {
     method public int getScaledHoverSlop();
     method public int getScaledMaximumDrawingCacheSize();
     method public int getScaledMaximumFlingVelocity();
-    method public int getScaledMinScalingSpan();
     method public int getScaledMinimumFlingVelocity();
+    method public int getScaledMinimumScalingSpan();
     method public int getScaledOverflingDistance();
     method public int getScaledOverscrollDistance();
     method public int getScaledPagingTouchSlop();
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java
index c24b8b2a5ee3c..7c69cfde2b9e3 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 c030ac2a0eb86..81e9c1372aed8 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 "