diff options
| author | Tim Murray <timmurray@google.com> | 2015-10-07 23:21:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-07 23:21:14 +0000 |
| commit | 0135690688c8285e022a2a8191c8582f2e6ea759 (patch) | |
| tree | a251602ee381e97a58cfc597fdeb17843444104a | |
| parent | ab7812750bca947abc9e8b1ce73a3041dbc2f2a9 (diff) | |
| parent | 57caeb5703de0c86be04f597d14e954987cd7955 (diff) | |
| download | base-marshmallow-dr-dev.tar.gz | |
Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-devmarshmallow-dr-dev
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 7d48a9a11eda..db68c29d025f 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -447,10 +447,11 @@ public class SurfaceView extends View { final boolean formatChanged = mFormat != mRequestedFormat; final boolean sizeChanged = mWidth != myWidth || mHeight != myHeight; final boolean visibleChanged = mVisible != mRequestedVisible; + final boolean layoutSizeChanged = getWidth() != mLayout.width || getHeight() != mLayout.height; if (force || creating || formatChanged || sizeChanged || visibleChanged || mLeft != mLocation[0] || mTop != mLocation[1] - || mUpdateWindowNeeded || mReportDrawNeeded || redrawNeeded) { + || mUpdateWindowNeeded || mReportDrawNeeded || redrawNeeded || layoutSizeChanged) { if (DEBUG) Log.i(TAG, "Changes: creating=" + creating + " format=" + formatChanged + " size=" + sizeChanged |