am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev

* commit '3fff156e13341b0bf818f83d2bb0e9404285dd0c':
  Pass surface insets from window attributes rather than params
This commit is contained in:
Alan Viverette
2014-11-04 19:40:08 +00:00
committed by Android Git Automerger

View File

@@ -1746,8 +1746,8 @@ public final class ViewRootImpl implements ViewParent,
if (hwInitialized ||
mWidth != mAttachInfo.mHardwareRenderer.getWidth() ||
mHeight != mAttachInfo.mHardwareRenderer.getHeight()) {
final Rect surfaceInsets = params != null ? params.surfaceInsets : null;
mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight, surfaceInsets);
mAttachInfo.mHardwareRenderer.setup(
mWidth, mHeight, mWindowAttributes.surfaceInsets);
if (!hwInitialized) {
mAttachInfo.mHardwareRenderer.invalidate(mSurface);
mFullRedrawNeeded = true;