summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/accessibility
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-10-03 16:43:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-03 16:43:13 -0700
commit9bc6cdaed30ec82c27e05c813890ea254c54548b (patch)
tree493086f5fdb28111e2ba74c4fbe300a1e7d68d23 /services/java/com/android/server/accessibility
parenteebcc0ff6079c5505496314308e86e3bf7118134 (diff)
parenta0867328db32884d0791435da04ecdeb297d0246 (diff)
downloadframeworks_base-9bc6cdaed30ec82c27e05c813890ea254c54548b.zip
frameworks_base-9bc6cdaed30ec82c27e05c813890ea254c54548b.tar.gz
frameworks_base-9bc6cdaed30ec82c27e05c813890ea254c54548b.tar.bz2
am a0867328: am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
* commit 'a0867328db32884d0791435da04ecdeb297d0246': Fix screen magnifier scaling due to ScaleGestureDetector changes.
Diffstat (limited to 'services/java/com/android/server/accessibility')
-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);
}