diff options
| author | Alan Viverette <alanv@google.com> | 2014-11-04 19:30:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-04 19:30:34 +0000 |
| commit | 18b055e106d5452ef390716d3ea8d1641a225361 (patch) | |
| tree | 5aef342b68ff8a93e02f6d9f149dce4a0574f324 /core/java/android | |
| parent | 50567bb1f047fbed512551534bff6ce017690588 (diff) | |
| parent | 93cad8c4d41f2256d0bfaa455686acf8442d97ff (diff) | |
Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 64501464cf5a..e464e7749bc9 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -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; |