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

Commit 5c01cd5a authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag "pinch_zoom_zero_min_span"" into main

parents ff44fea5 0ec80cdb

services/accessibility/java/com/android/server/accessibility/magnification/PanningScalingHandler.java

+3 −8
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.ScaleGestureDetector; 
import android.view.ViewConfiguration;



import com.android.internal.R;

import com.android.server.accessibility.Flags;



/**

 * Handles the behavior while receiving scaling and panning gestures if it's enabled.
@@ -73,13 +72,9 @@ class PanningScalingHandler extends 
        mMaxScale = maxScale;

        mMinScale = minScale;

        mBlockScroll = blockScroll;

        if (Flags.pinchZoomZeroMinSpan()) {

        mScaleGestureDetector = new ScaleGestureDetector(context,

                ViewConfiguration.get(context).getScaledTouchSlop() * 2,

                /* minSpan= */ 0, Handler.getMain(), this);

        } else {

            mScaleGestureDetector = new ScaleGestureDetector(context, this, Handler.getMain());

        }

        mScrollGestureDetector = new GestureDetector(context, this, Handler.getMain());

        mScaleGestureDetector.setQuickScaleEnabled(false);

        mMagnificationDelegate = magnificationDelegate;