Merge "Fix bug 3259292 - Make FrameLayout respect margins without a gravity setting" (8a78d759) · Commits · e / os / android_frameworks_base

core/java/android/widget/FrameLayout.java

+37 −34

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@ public class FrameLayout extends ViewGroup {

		boolean mForegroundBoundsChanged = false;

		private static final int DEFAULT_CHILD_GRAVITY = Gravity.TOP \| Gravity.LEFT;

		public FrameLayout(Context context) {
		super(context);
		}
		@@ -307,9 +309,11 @@ public class FrameLayout extends ViewGroup {
		int childLeft = parentLeft;
		int childTop = parentTop;

		final int gravity = lp.gravity;
		int gravity = lp.gravity;
		if (gravity == -1) {
		gravity = DEFAULT_CHILD_GRAVITY;
		}

		if (gravity != -1) {
		final int horizontalGravity = gravity & Gravity.HORIZONTAL_GRAVITY_MASK;
		final int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;

		@@ -342,7 +346,6 @@ public class FrameLayout extends ViewGroup {
		default:
		childTop = parentTop + lp.topMargin;
		}
		}

		child.layout(childLeft, childTop, childLeft + width, childTop + height);
		}