From a40627daee4891ab842fa509af254b349bff3a47 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Tue, 11 Sep 2012 16:47:21 -0700
Subject: [PATCH] Enforce encapsulation for MarginLayoutParams startMargin and
 endMargin

Change-Id: Ibaf5ade22612dfa52173978e4b520a6407162d13
---
 api/current.txt                       |  4 ++--
 core/java/android/view/ViewGroup.java | 26 ++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index c1d8c9e86ee3e..19116476aa183 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25535,12 +25535,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;
   }
 
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 62e1383533284..395a2cb5fea98 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -5568,7 +5568,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
          * 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.
@@ -5576,7 +5576,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
          * 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 abstract class ViewGroup extends View implements ViewParent, ViewManager
             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 abstract class ViewGroup extends View implements ViewParent, ViewManager
             }
         }
 
+        /**
+         * 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.
          *