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

Commit 1f4f9f6e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "getScaledMinScalingSpan -> getScaledMinimum..."

parents eb93c402 192c6356

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -51207,8 +51207,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();

core/java/android/view/ScaleGestureDetector.java

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

core/java/android/view/ViewConfiguration.java

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