Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev

Author: Fabrice Di Meglio

api/current.txt

@@ -25551,12 +25551,12 @@ package android.view {
     method protected boolean isLayoutRtl();
     method public boolean isMarginRelative();
     method public void setLayoutDirection(int);
+    method public void setMarginEnd(int);
+    method public void setMarginStart(int);
     method public void setMargins(int, int, int, int);
     field public int bottomMargin;
-    field public int endMargin;
     field public int leftMargin;
     field public int rightMargin;
-    field public int startMargin;
     field public int topMargin;
   }
 

core/java/android/view/ViewGroup.java

@@ -5568,15 +5568,15 @@ public static class MarginLayoutParams extends ViewGroup.LayoutParams {
          * to this field.
          */
         @ViewDebug.ExportedProperty(category = "layout")
-        public int startMargin = DEFAULT_RELATIVE;
+        private int startMargin = DEFAULT_RELATIVE;
 
         /**
          * The end margin in pixels of the child.
          * Call {@link ViewGroup#setLayoutParams(LayoutParams)} after reassigning a new value
          * to this field.
          */
         @ViewDebug.ExportedProperty(category = "layout")
-        public int endMargin = DEFAULT_RELATIVE;
+        private int endMargin = DEFAULT_RELATIVE;
 
         /**
          * The default start and end margin.
@@ -5723,6 +5723,17 @@ public void setMarginsRelative(int start, int top, int end, int bottom) {
             initialRightMargin = 0;
         }
 
+        /**
+         * Sets the relative start margin.
+         *
+         * @param start the start marging size
+         *
+         * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginStart
+         */
+        public void setMarginStart(int start) {
+            startMargin = start;
+        }
+
         /**
          * Returns the start margin in pixels.
          *
@@ -5741,6 +5752,17 @@ public int getMarginStart() {
             }
         }
 
+        /**
+         * Sets the relative end margin.
+         *
+         * @param end the end marging size
+         *
+         * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd
+         */
+        public void setMarginEnd(int end) {
+            endMargin = end;
+        }
+
         /**
          * Returns the end margin in pixels.
          *