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

Stop magnifying surface insets.

Browse Source 
Apparently magnification never should have touched the insets, but
the effects were small so we got away with it before. Now messing
with them disrupts the size of pop-up windows when magnification is
enabled.

Bug: 29048161
Change-Id: I4ab84f4f14cb92ca29b9085aaba7b854580f2c48
This commit is contained in:
Phil Weaver
2016-06-02 13:55:39 -07:00
parent cd0aa9cda8
commit a4b32b963b
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

@@ -816,22 +816,11 @@ class WindowStateAnimator {
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.
mTmpSize.left -= scale * attrs.surfaceInsets.left;
mTmpSize.top -= scale * attrs.surfaceInsets.top;
mTmpSize.right += scale * attrs.surfaceInsets.right;
mTmpSize.bottom += scale * attrs.surfaceInsets.bottom;
mTmpSize.left -= attrs.surfaceInsets.left;
mTmpSize.top -= attrs.surfaceInsets.top;
mTmpSize.right += attrs.surfaceInsets.right;
mTmpSize.bottom += attrs.surfaceInsets.bottom;
}
boolean hasSurface() {