Commit d3156a2a authored Oct 19, 2012 by Fabrice Di Meglio

Fix bug #7164967...

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

parent 398a6713

core/java/android/view/ViewGroup.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -5990,11 +5990,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		*/
		@Override
		public void resolveLayoutDirection(int layoutDirection) {
		// No need to resolve if it is the same layout direction as before
		if (this.layoutDirection == layoutDirection) {
		return;
		}

		setLayoutDirection(layoutDirection);

		if (!isMarginRelative()) return;