Merge "Fix bug in magnification coordinate calculation." into nyc-mr1-dev (110357c0) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -3683,13 +3683,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		Rect boundsInScreen = mTempRect;
		focus.getBoundsInScreen(boundsInScreen);

		// Clip to the window bounds.
		Rect windowBounds = mTempRect1;
		getWindowBounds(focus.getWindowId(), windowBounds);
		if (!boundsInScreen.intersect(windowBounds)) {
		return false;
		}

		// Apply magnification if needed.
		MagnificationSpec spec = getCompatibleMagnificationSpecLocked(focus.getWindowId());
		if (spec != null && !spec.isNop()) {
		@@ -3697,6 +3690,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		boundsInScreen.scale(1 / spec.scale);
		}

		// Clip to the window bounds.
		Rect windowBounds = mTempRect1;
		getWindowBounds(focus.getWindowId(), windowBounds);
		if (!boundsInScreen.intersect(windowBounds)) {
		return false;
		}

		// Clip to the screen bounds.
		Point screenSize = mTempPoint;
		mDefaultDisplay.getRealSize(screenSize);