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

am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.

Browse Source 
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics
This commit is contained in:
Grace Kloba
2010-01-20 23:26:03 -08:00
committed by Android Git Automerger
parent 425324e97b d5ada83c71
commit 5b74576218
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,12 +147,9 @@ public class ScaleGestureDetector {
public ScaleGestureDetector(Context context, OnScaleGestureListener listener) { public ScaleGestureDetector(Context context, OnScaleGestureListener listener) {
ViewConfiguration config = ViewConfiguration.get(context); ViewConfiguration config = ViewConfiguration.get(context);
DisplayMetrics metrics = context.getResources().getDisplayMetrics();
mContext = context; mContext = context;
mListener = listener; mListener = listener;
mEdgeSlop = config.getScaledEdgeSlop(); mEdgeSlop = config.getScaledEdgeSlop();
mRightSlopEdge = metrics.widthPixels - mEdgeSlop;
mBottomSlopEdge = metrics.heightPixels - mEdgeSlop;
} }
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
@@ -165,6 +162,11 @@ public class ScaleGestureDetector {
event.getPointerCount() >= 2) { event.getPointerCount() >= 2) {
// We have a new multi-finger gesture // We have a new multi-finger gesture
// as orientation can change, query the metrics in touch down
DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
mRightSlopEdge = metrics.widthPixels - mEdgeSlop;
mBottomSlopEdge = metrics.heightPixels - mEdgeSlop;
// Be paranoid in case we missed an event // Be paranoid in case we missed an event
reset(); reset();