summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-10-03 01:17:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-03 01:17:10 +0000
commit9907a109ced54cffc7b4f5e9e81365c78df1f1a9 (patch)
tree12110b9a4369987c805eb528c16c19624c3e6f6e
parent9a93f6f039920c2e24cdef172c9cbd39586b949c (diff)
parent1fdbaa100c00e7e93db6f96f8ff9327a0aad968c (diff)
downloadframeworks_base-9907a109ced54cffc7b4f5e9e81365c78df1f1a9.zip
frameworks_base-9907a109ced54cffc7b4f5e9e81365c78df1f1a9.tar.gz
frameworks_base-9907a109ced54cffc7b4f5e9e81365c78df1f1a9.tar.bz2
Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
-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);
}