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

Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-29 20:37:32 +00:00
committed by Android (Google) Code Review
parent 5fb90f91b7 1bccabf3c4
commit 3446a6ef71
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/ViewRootImpl.java
View File

@@ -389,6 +389,8 @@ public final class ViewRootImpl implements ViewParent,
/** Set to true once doDie() has been called. */ /** Set to true once doDie() has been called. */
private boolean mRemoved; private boolean mRemoved;
private boolean mNeedsHwRendererSetup;
/** /**
* Consistency verifier for debugging purposes. * Consistency verifier for debugging purposes.
*/ */
@@ -915,6 +917,11 @@ public final class ViewRootImpl implements ViewParent,
mWindowAttributes.surfaceInsets.set( mWindowAttributes.surfaceInsets.set(
oldInsetLeft, oldInsetTop, oldInsetRight, oldInsetBottom); oldInsetLeft, oldInsetTop, oldInsetRight, oldInsetBottom);
mWindowAttributes.hasManualSurfaceInsets = oldHasManualSurfaceInsets; mWindowAttributes.hasManualSurfaceInsets = oldHasManualSurfaceInsets;
} else if (mWindowAttributes.surfaceInsets.left != oldInsetLeft
|| mWindowAttributes.surfaceInsets.top != oldInsetTop
|| mWindowAttributes.surfaceInsets.right != oldInsetRight
|| mWindowAttributes.surfaceInsets.bottom != oldInsetBottom) {
mNeedsHwRendererSetup = true;
} }
applyKeepScreenOnFlag(mWindowAttributes); applyKeepScreenOnFlag(mWindowAttributes);
@@ -1959,9 +1966,11 @@ public final class ViewRootImpl implements ViewParent,
if (hardwareRenderer != null && hardwareRenderer.isEnabled()) { if (hardwareRenderer != null && hardwareRenderer.isEnabled()) {
if (hwInitialized if (hwInitialized
|| mWidth != hardwareRenderer.getWidth() || mWidth != hardwareRenderer.getWidth()
|| mHeight != hardwareRenderer.getHeight()) { || mHeight != hardwareRenderer.getHeight()
|| mNeedsHwRendererSetup) {
hardwareRenderer.setup(mWidth, mHeight, mAttachInfo, hardwareRenderer.setup(mWidth, mHeight, mAttachInfo,
mWindowAttributes.surfaceInsets); mWindowAttributes.surfaceInsets);
mNeedsHwRendererSetup = false;
} }
} }