Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a regression in magnification center x,y" into nyc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-04-13 01:05:46 +00:00
committed by Android (Google) Code Review
parent c375dd43af 0a59531581
commit be43d08ca9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/accessibility/java/com/android/server/accessibility/MagnificationController.java
View File

@@ -156,10 +156,10 @@ class MagnificationController {
final float offsetY = sentSpec.offsetY; final float offsetY = sentSpec.offsetY;
// Compute the new center and update spec as needed. // Compute the new center and update spec as needed.
final float centerX = (mMagnifiedBounds.width() / 2.0f - offsetX) / scale final float centerX = (mMagnifiedBounds.width() / 2.0f
+ mMagnifiedBounds.left; + mMagnifiedBounds.left - offsetX) / scale;
final float centerY = (mMagnifiedBounds.height() / 2.0f - offsetY) / scale final float centerY = (mMagnifiedBounds.height() / 2.0f
+ mMagnifiedBounds.top; + mMagnifiedBounds.top - offsetY) / scale;
if (updateSpec) { if (updateSpec) {
setScaleAndCenter(scale, centerX, centerY, false); setScaleAndCenter(scale, centerX, centerY, false);
} else { } else {
@@ -256,7 +256,7 @@ class MagnificationController {
public float getCenterX() { public float getCenterX() {
synchronized (mLock) { synchronized (mLock) {
return (mMagnifiedBounds.width() / 2.0f return (mMagnifiedBounds.width() / 2.0f
- getOffsetX()) / getScale() + mMagnifiedBounds.left; + mMagnifiedBounds.left - getOffsetX()) / getScale();
} }
} }
@@ -279,7 +279,7 @@ class MagnificationController {
public float getCenterY() { public float getCenterY() {
synchronized (mLock) { synchronized (mLock) {
return (mMagnifiedBounds.height() / 2.0f return (mMagnifiedBounds.height() / 2.0f
- getOffsetY()) / getScale() + mMagnifiedBounds.top; + mMagnifiedBounds.top - getOffsetY()) / getScale();
} }
} }