am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev

automerge: 2381825

* commit '2381825db49718891e345eebe34b58644beab10d':
  Do not go through a layout if visibility is GONE
This commit is contained in:
Craig Mautner
2014-10-28 17:59:39 +00:00
committed by android-build-merger

View File

@@ -2997,8 +2997,8 @@ public class WindowManagerService extends IWindowManager.Stub
return 0;
}
WindowStateAnimator winAnimator = win.mWinAnimator;
if (win.mRequestedWidth != requestedWidth
|| win.mRequestedHeight != requestedHeight) {
if (viewVisibility != View.GONE && (win.mRequestedWidth != requestedWidth
|| win.mRequestedHeight != requestedHeight)) {
win.mLayoutNeeded = true;
win.mRequestedWidth = requestedWidth;
win.mRequestedHeight = requestedHeight;