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

* commit '74fe6ce72dcbc7af501022e7617528c30a0983bb':
  Do not go through a layout if visibility is GONE
This commit is contained in:
Craig Mautner
2014-10-28 14:00:54 +00:00
committed by Android Git Automerger

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;