Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev

Author: sganov

services/java/com/android/server/accessibility/ScreenMagnifier.java

@@ -353,11 +353,13 @@ private final class MagnifiedContentInteractonStateHandler
         private static final float MIN_SCALE = 1.3f;
         private static final float MAX_SCALE = 5.0f;
 
+        private static final float SCALING_THRESHOLD = 0.3f;
+
         private final ScaleGestureDetector mScaleGestureDetector;
         private final GestureDetector mGestureDetector;
 
-        private float mScaleFocusX = -1;
-        private float mScaleFocusY = -1;
+        private float mInitialScaleFactor = -1;
+        private boolean mScaling;
 
         public MagnifiedContentInteractonStateHandler(Context context) {
             mScaleGestureDetector = new ScaleGestureDetector(context, this);
@@ -405,21 +407,26 @@ public boolean onScroll(MotionEvent first, MotionEvent second, float distanceX,
 
         @Override
         public boolean onScale(ScaleGestureDetector detector) {
-            if (mCurrentState != STATE_MAGNIFIED_INTERACTION) {
-                return true;
+            if (!mScaling) {
+                if (mInitialScaleFactor < 0) {
+                    mInitialScaleFactor = detector.getScaleFactor();
+                } else {
+                    final float deltaScale = detector.getScaleFactor() - mInitialScaleFactor;
+                    if (Math.abs(deltaScale) > SCALING_THRESHOLD) {
+                        mScaling = true;
+                        return true;
+                    }
+                }
+                return false;
             }
             final float newScale = mMagnificationController.getScale()
                     * detector.getScaleFactor();
             final float normalizedNewScale = Math.min(Math.max(newScale, MIN_SCALE), MAX_SCALE);
             if (DEBUG_SCALING) {
                 Slog.i(LOG_TAG, "normalizedNewScale: " + normalizedNewScale);
             }
-            if (mScaleFocusX < 0 && mScaleFocusY < 0) {
-                mScaleFocusX = detector.getFocusX();
-                mScaleFocusY = detector.getFocusY();
-            }
-            mMagnificationController.setScale(normalizedNewScale, mScaleFocusX,
-                    mScaleFocusY, false);
+            mMagnificationController.setScale(normalizedNewScale, detector.getFocusX(),
+                    detector.getFocusY(), false);
             return true;
         }
 
@@ -434,8 +441,8 @@ public void onScaleEnd(ScaleGestureDetector detector) {
         }
 
         private void clear() {
-            mScaleFocusX = -1;
-            mScaleFocusY = -1;
+            mInitialScaleFactor = -1;
+            mScaling = false;
         }
     }