From 1fdbaa100c00e7e93db6f96f8ff9327a0aad968c Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Wed, 2 Oct 2013 17:52:51 -0700 Subject: Fix screen magnifier scaling due to ScaleGestureDetector changes. The scale gesture detector has a new behavior to make onScale callbacks during swipe after a double tap. The screen magnification is triggered after a trippe tap so if the user trippe taps and holds to do a temporary magnification and tries to change the zoom level with another finger, erroneous results are obtained. The ScaleGestureDetector uses an APIs level check for the new behavior but the ScreenMagnifier is a platform feature. We now explicitly ask for the old behavior. bug:11033376 Change-Id: I0dfb14dd3abcaa34ad1f40447c631b4203797378 --- services/java/com/android/server/accessibility/ScreenMagnifier.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/java/com/android/server/accessibility/ScreenMagnifier.java index 1bf2c42..5f12cf4 100644 --- a/services/java/com/android/server/accessibility/ScreenMagnifier.java +++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java @@ -502,6 +502,7 @@ public final class ScreenMagnifier extends IMagnificationCallbacks.Stub public MagnifiedContentInteractonStateHandler(Context context) { mScaleGestureDetector = new ScaleGestureDetector(context, this); + mScaleGestureDetector.setQuickScaleEnabled(false); mGestureDetector = new GestureDetector(context, this); } -- cgit v1.1