diff options
| author | Chet Haase <chet@google.com> | 2015-12-07 12:58:06 -0800 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2015-12-07 13:17:44 -0800 |
| commit | 016f4457574c33b4c9c8a74189c77e1fbe411a3e (patch) | |
| tree | fd61a19170d9a68481e01de7c17e711f61b65bca /core/java/android/widget/LinearLayout.java | |
| parent | db9df39992ce6a1a09c2f26cde639baf126fa6f5 (diff) | |
Fix requestLayout() optimizations
A bug in recent layout optimizations was causing the framework to avoid
laying out containers with WRAP_CONTENT in one axis or the other.
This fix updates the logic in the code that finds dependent layout axes
to correctly account for this case.
Issue #25980198 requestLayout() sometimes doesn't result in measure/layout for view
Change-Id: Ie5f678beef5d8c4ba25291ffdcd59797d4697acc
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index ba868a15ef1e..bdb1e83438c5 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -683,7 +683,7 @@ public class LinearLayout extends ViewGroup { } } - if (matchAxisFilter != 0) { + if (matchAxisFilter != 0 || wrapAxisFilter != 0) { final ViewParent parent = getParent(); if (parent != null) { // If our parent depends on us for an axis, then our layout can also be affected |