summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-10-02 17:52:51 -0700
committerSvetoslav <svetoslavganov@google.com>2013-10-02 17:53:00 -0700
commit1fdbaa100c00e7e93db6f96f8ff9327a0aad968c (patch)
tree8feae8e6caf147b195e5d227046870123e68dc94
parent9ca82d333cfeb7aa5218efbca95763c15dc440e9 (diff)
downloadframeworks_base-1fdbaa100c00e7e93db6f96f8ff9327a0aad968c.zip
frameworks_base-1fdbaa100c00e7e93db6f96f8ff9327a0aad968c.tar.gz
frameworks_base-1fdbaa100c00e7e93db6f96f8ff9327a0aad968c.tar.bz2
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
-rw-r--r--services/java/com/android/server/accessibility/ScreenMagnifier.java1
1 files changed, 1 insertions, 0 deletions
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);
}