diff options
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 9 | ||||
| -rwxr-xr-x | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index a74e438c07f4..ee3f5d8e266b 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -17,6 +17,7 @@ package android.view; import android.content.Context; +import android.content.res.Resources; import android.os.SystemClock; import android.util.FloatMath; @@ -162,9 +163,11 @@ public class ScaleGestureDetector { mContext = context; mListener = listener; mSpanSlop = ViewConfiguration.get(context).getScaledTouchSlop() * 2; - mTouchMinMajor = - (int) (context.getResources().getDisplayMetrics().density * TOUCH_MIN_MAJOR + 0.5f); - mMinSpan = context.getResources().getDimensionPixelSize( + + final Resources res = context.getResources(); + mTouchMinMajor = res.getDimensionPixelSize( + com.android.internal.R.dimen.config_minScalingTouchMajor); + mMinSpan = res.getDimensionPixelSize( com.android.internal.R.dimen.config_minScalingSpan); } diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index a00f071fd548..26d04e953659 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -941,6 +941,10 @@ reported by the hardware. --> <dimen name="config_minScalingSpan">27mm</dimen> + <!-- Minimum accepted value for touchMajor while scaling. This may be tuned + per-device in overlays. --> + <dimen name="config_minScalingTouchMajor">48dp</dimen> + <!-- Safe headphone volume index. When music stream volume is below this index the SPL on headphone output is compliant to EN 60950 requirements for portable music players. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e615fd40ae4d..fae63db226c0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1150,6 +1150,7 @@ <java-symbol type="string" name="bluetooth_a2dp_audio_route_name" /> <java-symbol type="dimen" name="config_minScalingSpan" /> + <java-symbol type="dimen" name="config_minScalingTouchMajor" /> <!-- From android.policy --> <java-symbol type="anim" name="app_starting_exit" /> |