drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-09-12 13:25:21 -07:00
committed by Android (Google) Code Review
parent 4f8da32ffa a40627daee
commit b967464049
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@ -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;
}

26
core/java/android/view/ViewGroup.java
View File

@ -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.
*