Merge "Enforce the contract laid out in Javadocs" (ede9ad62) · Commits · e / os / android_frameworks_base

core/java/android/widget/TableLayout.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -710,6 +710,7 @@ public class TableLayout extends LinearLayout {
	*/		*/
	public LayoutParams(ViewGroup.LayoutParams p) {		public LayoutParams(ViewGroup.LayoutParams p) {
	super(p);		super(p);
			width = MATCH_PARENT;
	}		}

	/**		/**
	@@ -717,6 +718,10 @@ public class TableLayout extends LinearLayout {
	*/		*/
	public LayoutParams(MarginLayoutParams source) {		public LayoutParams(MarginLayoutParams source) {
	super(source);		super(source);
			width = MATCH_PARENT;
			if (source instanceof TableLayout.LayoutParams) {
			weight = ((TableLayout.LayoutParams) source).weight;
			}
	}		}

	/**		/**