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

Merge "Stop magnifying surface insets." into nyc-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-06-10 00:08:21 +00:00
committed by Android (Google) Code Review
parent 9faaf5418a a4b32b963b
commit 4663b4e806
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -824,22 +824,11 @@ class WindowStateAnimator {
mTmpSize.bottom = mTmpSize.top + 1; mTmpSize.bottom = mTmpSize.top + 1;
} }
final int displayId = w.getDisplayId();
float scale = 1.0f;
// Magnification is supported only for the default display.
if (mService.mAccessibilityController != null && displayId == DEFAULT_DISPLAY) {
final MagnificationSpec spec =
mService.mAccessibilityController.getMagnificationSpecForWindowLocked(w);
if (spec != null && !spec.isNop()) {
scale = spec.scale;
}
}
// Adjust for surface insets. // Adjust for surface insets.
mTmpSize.left -= scale * attrs.surfaceInsets.left; mTmpSize.left -= attrs.surfaceInsets.left;
mTmpSize.top -= scale * attrs.surfaceInsets.top; mTmpSize.top -= attrs.surfaceInsets.top;
mTmpSize.right += scale * attrs.surfaceInsets.right; mTmpSize.right += attrs.surfaceInsets.right;
mTmpSize.bottom += scale * attrs.surfaceInsets.bottom; mTmpSize.bottom += attrs.surfaceInsets.bottom;
} }
boolean hasSurface() { boolean hasSurface() {