Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d338b977: am db380410: am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev

Browse Source 
* commit 'd338b9775bd549bc9d7b2153e60432ac694701fa':
  Allow more scaling values to be tuned in resource overlays
This commit is contained in:
Adam Powell
2012-10-09 13:32:38 -07:00
committed by Android Git Automerger
parent 35b9ec35e7 d338b9775b
commit 68293b35dc
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/ScaleGestureDetector.java
View File

@@ -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);
}