Merge "Add copy constructors for all widget-specific LayoutParams"
diff --git a/api/current.txt b/api/current.txt
index 71ab2d5..a4aa751 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30547,6 +30547,7 @@
ctor public FrameLayout.LayoutParams(int, int, int);
ctor public FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
ctor public FrameLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public FrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams);
field public int gravity;
}
@@ -30811,6 +30812,7 @@
ctor public LinearLayout.LayoutParams(int, int, float);
ctor public LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
ctor public LinearLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams);
method public java.lang.String debug(java.lang.String);
field public int gravity;
field public float weight;
@@ -31243,6 +31245,7 @@
ctor public RelativeLayout.LayoutParams(int, int);
ctor public RelativeLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
ctor public RelativeLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public RelativeLayout.LayoutParams(android.widget.RelativeLayout.LayoutParams);
method public void addRule(int);
method public void addRule(int, int);
method public java.lang.String debug(java.lang.String);
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java
index 691c941..d9d4ad7 100644
--- a/core/java/android/widget/FrameLayout.java
+++ b/core/java/android/widget/FrameLayout.java
@@ -656,5 +656,17 @@
public LayoutParams(ViewGroup.MarginLayoutParams source) {
super(source);
}
+
+ /**
+ * Copy constructor. Clones the width, height, margin values, and
+ * gravity of the source.
+ *
+ * @param source The layout params to copy from.
+ */
+ public LayoutParams(LayoutParams source) {
+ super(source);
+
+ this.gravity = source.gravity;
+ }
}
}
diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java
index b0ab70d..109fcfe 100644
--- a/core/java/android/widget/GridLayout.java
+++ b/core/java/android/widget/GridLayout.java
@@ -1961,12 +1961,16 @@
}
/**
- * {@inheritDoc}
+ * Copy constructor. Clones the width, height, margin values, row spec,
+ * and column spec of the source.
+ *
+ * @param source The layout params to copy from.
*/
- public LayoutParams(LayoutParams that) {
- super(that);
- this.rowSpec = that.rowSpec;
- this.columnSpec = that.columnSpec;
+ public LayoutParams(LayoutParams source) {
+ super(source);
+
+ this.rowSpec = source.rowSpec;
+ this.columnSpec = source.columnSpec;
}
// AttributeSet constructors
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index bc57c36e..ad60a95 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -1871,10 +1871,23 @@
/**
* {@inheritDoc}
*/
- public LayoutParams(MarginLayoutParams source) {
+ public LayoutParams(ViewGroup.MarginLayoutParams source) {
super(source);
}
+ /**
+ * Copy constructor. Clones the width, height, margin values, weight,
+ * and gravity of the source.
+ *
+ * @param source The layout params to copy from.
+ */
+ public LayoutParams(LayoutParams source) {
+ super(source);
+
+ this.weight = source.weight;
+ this.gravity = source.gravity;
+ }
+
@Override
public String debug(String output) {
return output + "LinearLayout.LayoutParams={width=" + sizeToString(width) +
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index fd3dc03..f73e2c4 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -1321,6 +1321,24 @@
super(source);
}
+ /**
+ * Copy constructor. Clones the width, height, margin values, and rules
+ * of the source.
+ *
+ * @param source The layout params to copy from.
+ */
+ public LayoutParams(LayoutParams source) {
+ super(source);
+
+ this.mIsRtlCompatibilityMode = source.mIsRtlCompatibilityMode;
+ this.mRulesChanged = source.mRulesChanged;
+ this.alignWithParent = source.alignWithParent;
+
+ System.arraycopy(source.mRules, LEFT_OF, this.mRules, LEFT_OF, VERB_COUNT);
+ System.arraycopy(
+ source.mInitialRules, LEFT_OF, this.mInitialRules, LEFT_OF, VERB_COUNT);
+ }
+
@Override
public String debug(String output) {
return output + "ViewGroup.LayoutParams={ width=" + sizeToString(width) +