diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-03-11 16:42:00 -0700 |
|---|---|---|
| committer | Filip Gruszczynski <gruszczy@google.com> | 2015-03-26 15:44:57 -0700 |
| commit | 415ab1ab833fe5ccc070615beb7b8afc25badf56 (patch) | |
| tree | 0a123c7348e51e75a9aa30682ff5ad4caf314465 /core/java/android/view/ViewGroup.java | |
| parent | 02bc1fe6b098a87571d7ad94727f434fb614ddb8 (diff) | |
| download | frameworks_base-415ab1ab833fe5ccc070615beb7b8afc25badf56.zip frameworks_base-415ab1ab833fe5ccc070615beb7b8afc25badf56.tar.gz frameworks_base-415ab1ab833fe5ccc070615beb7b8afc25badf56.tar.bz2 | |
Provide size hint inside UNSPECIFIED measure spec.
Change-Id: I1802ea0f6a94af0a87be81abd5fd1adfb758e854
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 87f3e94..31c3fe8 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -5727,12 +5727,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } else if (childDimension == LayoutParams.MATCH_PARENT) { // Child wants to be our size... find out how big it should // be - resultSize = 0; + resultSize = size; resultMode = MeasureSpec.UNSPECIFIED; } else if (childDimension == LayoutParams.WRAP_CONTENT) { // Child wants to determine its own size.... find out how // big it should be - resultSize = 0; + resultSize = size; resultMode = MeasureSpec.UNSPECIFIED; } break; |