getScaledMinScalingSpan -> getScaledMinimum...
Fixes: 126376129 Test: android.view.cts.ViewConfigurationTest Change-Id: Ie5ac265bb8a390d9b82a61cac32ac1dc02556eb7
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 "
|
||||
|
||||
Reference in New Issue
Block a user