Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix requestLayout() optimizations"

Browse Source
This commit is contained in:
Chet Haase
2015-12-07 21:29:00 +00:00
committed by Android (Google) Code Review
parent 7f864cc79d 016f445757
commit f1b40f65b0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ViewGroup.java
View File

@@ -5631,7 +5631,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
final int matchAxisFilter = ((lp.width == MATCH_PARENT ? FLAG_LAYOUT_AXIS_HORIZONTAL : 0)
| (lp.height == MATCH_PARENT ? FLAG_LAYOUT_AXIS_VERTICAL : 0)) & axisFilter;
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

2
core/java/android/widget/LinearLayout.java
View File

@@ -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