Skip to content

Commit d3156a2

Browse files
author
Fabrice Di Meglio
committed
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
This was a regression introduced by a previous CL. - we actually need to let the layout params resolution goes all the time as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup. The current implementation is simple and works even if it is doing sometimes a bit more than it should really do. This is a well conscious tradeoff. Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
1 parent 398a671 commit d3156a2

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

core/java/android/view/ViewGroup.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5990,11 +5990,6 @@ public int getLayoutDirection() {
59905990
*/
59915991
@Override
59925992
public void resolveLayoutDirection(int layoutDirection) {
5993-
// No need to resolve if it is the same layout direction as before
5994-
if (this.layoutDirection == layoutDirection) {
5995-
return;
5996-
}
5997-
59985993
setLayoutDirection(layoutDirection);
59995994

60005995
if (!isMarginRelative()) return;

0 commit comments

Comments
 (0)