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

Commit f96a91ab authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 5b745762: am d5ada83c: ScaleGestureDetector needs to query the... 

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

Merge commit '5b745762'

* commit '5b745762':
  ScaleGestureDetector needs to query the displaymetrics
parents a667fda9 5b745762

core/java/android/view/ScaleGestureDetector.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -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();