diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-23 12:05:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-23 12:05:43 -0800 |
| commit | ccb9a0a9f0376f5971d0c0f79b297ec0cc1dd6c1 (patch) | |
| tree | 60538478c1d17ba10bb68ddb1cf806c9224dfa13 /core/java/android/view/ViewRoot.java | |
| parent | 15211867f66f99524790c0859063bfa312bd9437 (diff) | |
| parent | 11a5d42454fad1f61eb4874855113c5416396888 (diff) | |
am 11a5d424: am b149f5c8: Merge "Fix issue #3302006: Cannot see the dialog lunched from a transparent activity." into honeycomb
* commit '11a5d42454fad1f61eb4874855113c5416396888':
Fix issue #3302006: Cannot see the dialog lunched from a transparent activity.
Diffstat (limited to 'core/java/android/view/ViewRoot.java')
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 19ecb601710a..e73f0dda7a8e 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -1138,7 +1138,7 @@ public final class ViewRoot extends Handler implements ViewParent, if (DEBUG_LAYOUT) Log.v(TAG, "Ooops, something changed! mWidth=" + mWidth + " measuredWidth=" + host.getMeasuredWidth() + " mHeight=" + mHeight - + " measuredHeight" + host.getMeasuredHeight() + + " measuredHeight=" + host.getMeasuredHeight() + " coveredInsetsChanged=" + contentInsetsChanged); // Ask host how big it wants to be |