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

am 93297d20: Merge "Apply the scale to surfaceinsets when computing crop region" into mnc-dev

Browse Source 
* commit '93297d20865b1548d4405c22bf0c7f94140b43c9':
  Apply the scale to surfaceinsets when computing crop region
This commit is contained in:
Wale Ogunwale
2015-06-19 21:36:30 +00:00
committed by Android Git Automerger
parent 1fff1371b3 93297d2086
commit db33863e52
1 changed files with 15 additions and 4 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

@@ -1383,10 +1383,21 @@ class WindowStateAnimator {
// Adjust for surface insets. // Adjust for surface insets.
final LayoutParams attrs = w.getAttrs(); final LayoutParams attrs = w.getAttrs();
width += attrs.surfaceInsets.left + attrs.surfaceInsets.right; final int displayId = w.getDisplayId();
height += attrs.surfaceInsets.top + attrs.surfaceInsets.bottom; float scale = 1.0f;
left -= attrs.surfaceInsets.left; // Magnification is supported only for the default display.
top -= attrs.surfaceInsets.top; if (mService.mAccessibilityController != null && displayId == Display.DEFAULT_DISPLAY) {
MagnificationSpec spec =
mService.mAccessibilityController.getMagnificationSpecForWindowLocked(w);
if (spec != null && !spec.isNop()) {
scale = spec.scale;
}
}
width += scale * (attrs.surfaceInsets.left + attrs.surfaceInsets.right);
height += scale * (attrs.surfaceInsets.top + attrs.surfaceInsets.bottom);
left -= scale * attrs.surfaceInsets.left;
top -= scale * attrs.surfaceInsets.top;
final boolean surfaceMoved = mSurfaceX != left || mSurfaceY != top; final boolean surfaceMoved = mSurfaceX != left || mSurfaceY != top;
if (surfaceMoved) { if (surfaceMoved) {