diff options
author | Svetoslav <svetoslavganov@google.com> | 2013-10-03 15:38:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 15:38:42 -0700 |
commit | a0867328db32884d0791435da04ecdeb297d0246 (patch) | |
tree | 41a4e53de22150812e423abd666533360f86fde3 /services/java/com/android/server/accessibility | |
parent | cd6a2d3079ee67658535773021c16787b9adba6e (diff) | |
parent | 36f38f4efc52f195a7f30f986ed3e6633aa179f4 (diff) | |
download | frameworks_base-a0867328db32884d0791435da04ecdeb297d0246.zip frameworks_base-a0867328db32884d0791435da04ecdeb297d0246.tar.gz frameworks_base-a0867328db32884d0791435da04ecdeb297d0246.tar.bz2 |
am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
* commit '36f38f4efc52f195a7f30f986ed3e6633aa179f4':
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.java | 1 |
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); } |