Merge "Fix window visibility during layout" into oc-mr1-dev
am: 7a59a62276
Change-Id: Ic4726a77ce790616d50ff84edc35e7941b409659
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index cac27af..462dad3 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -231,6 +231,7 @@
updateRequestedVisibility();
mAttachedToWindow = true;
+ mParent.requestTransparentRegion(SurfaceView.this);
if (!mGlobalListenersAdded) {
ViewTreeObserver observer = getViewTreeObserver();
observer.addOnScrollChangedListener(mScrollChangedListener);
@@ -269,8 +270,6 @@
if (mPendingReportDraws > 0) {
mDrawFinished = true;
if (mAttachedToWindow) {
- mParent.requestTransparentRegion(SurfaceView.this);
-
notifyDrawFinished();
invalidate();
}