Make MarginLayoutParams startMargin and endMargin API public (54546f22) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -614,8 +614,10 @@ package android {
		field public static final int layout_height = 16842997; // 0x10100f5
		field public static final int layout_margin = 16842998; // 0x10100f6
		field public static final int layout_marginBottom = 16843002; // 0x10100fa
		field public static final int layout_marginEnd = 16843690; // 0x10103aa
		field public static final int layout_marginLeft = 16842999; // 0x10100f7
		field public static final int layout_marginRight = 16843001; // 0x10100f9
		field public static final int layout_marginStart = 16843689; // 0x10103a9
		field public static final int layout_marginTop = 16843000; // 0x10100f8
		field public static final int layout_row = 16843643; // 0x101037b
		field public static final int layout_rowSpan = 16843644; // 0x101037c
		@@ -23849,10 +23851,15 @@ package android.view {
		ctor public ViewGroup.MarginLayoutParams(int, int);
		ctor public ViewGroup.MarginLayoutParams(android.view.ViewGroup.MarginLayoutParams);
		ctor public ViewGroup.MarginLayoutParams(android.view.ViewGroup.LayoutParams);
		method public int getMarginEnd();
		method public int getMarginStart();
		method public boolean isMarginRelative();
		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

+6 −13

Original line number	Diff line number	Diff line
		@@ -5123,20 +5123,19 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager

		/**
		* The start margin in pixels of the child.
		*
		* @hide
		*
		* Call {@link ViewGroup#setLayoutParams(LayoutParams)} after reassigning a new value
		* to this field.
		*/
		@ViewDebug.ExportedProperty(category = "layout")
		protected int startMargin = DEFAULT_RELATIVE;
		public int startMargin = DEFAULT_RELATIVE;

		/**
		* The end margin in pixels of the child.
		*
		* @hide
		* Call {@link ViewGroup#setLayoutParams(LayoutParams)} after reassigning a new value
		* to this field.
		*/
		@ViewDebug.ExportedProperty(category = "layout")
		protected int endMargin = DEFAULT_RELATIVE;
		public int endMargin = DEFAULT_RELATIVE;

		/**
		* The default start and end margin.
		@@ -5268,8 +5267,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginStart
		*
		* @return the start margin in pixels.
		*
		* @hide
		*/
		public int getMarginStart() {
		return startMargin;
		@@ -5281,8 +5278,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd
		*
		* @return the end margin in pixels.
		*
		* @hide
		*/
		public int getMarginEnd() {
		return endMargin;
		@@ -5295,8 +5290,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd
		*
		* @return true if either marginStart or marginEnd has been set
		*
		* @hide
		*/
		public boolean isMarginRelative() {
		return (startMargin != DEFAULT_RELATIVE) \|\| (endMargin != DEFAULT_RELATIVE);

core/res/res/values/public.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -3502,4 +3502,7 @@
		<public type="attr" name="paddingStart"/>
		<public type="attr" name="paddingEnd"/>

		<public type="attr" name="layout_marginStart"/>
		<public type="attr" name="layout_marginEnd"/>

		</resources>