Merge "Add layout_marginHorizontal|Vertical attributes" (a8ba43d2) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −2

Original line number	Diff line number	Diff line
		@@ -793,10 +793,12 @@ package android {
		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 = 16843702; // 0x10103b6
		field public static final int layout_marginHorizontal = 16844091; // 0x101053b
		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 = 16843701; // 0x10103b5
		field public static final int layout_marginTop = 16843000; // 0x10100f8
		field public static final int layout_marginVertical = 16844092; // 0x101053c
		field public static final int layout_row = 16843643; // 0x101037b
		field public static final int layout_rowSpan = 16843644; // 0x101037c
		field public static final int layout_rowWeight = 16843864; // 0x1010458
		@@ -864,7 +866,7 @@ package android {
		field public static final int mediaRouteTypes = 16843694; // 0x10103ae
		field public static final int menuCategory = 16843230; // 0x10101de
		field public static final int mimeType = 16842790; // 0x1010026
		field public static final int min = 16843367; // 0x1010267
		field public static final int min = 16844089; // 0x1010539
		field public static final int minDate = 16843583; // 0x101033f
		field public static final int minEms = 16843098; // 0x101015a
		field public static final int minHeight = 16843072; // 0x1010140
		@@ -927,11 +929,13 @@ package android {
		field public static final int padding = 16842965; // 0x10100d5
		field public static final int paddingBottom = 16842969; // 0x10100d9
		field public static final int paddingEnd = 16843700; // 0x10103b4
		field public static final int paddingHorizontal = 16844093; // 0x101053d
		field public static final int paddingLeft = 16842966; // 0x10100d6
		field public static final int paddingMode = 16843863; // 0x1010457
		field public static final int paddingRight = 16842968; // 0x10100d8
		field public static final int paddingStart = 16843699; // 0x10103b3
		field public static final int paddingTop = 16842967; // 0x10100d7
		field public static final int paddingVertical = 16844094; // 0x101053e
		field public static final int panelBackground = 16842846; // 0x101005e
		field public static final int panelColorBackground = 16842849; // 0x1010061
		field public static final int panelColorForeground = 16842848; // 0x1010060
		@@ -1050,7 +1054,7 @@ package android {
		field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093
		field public static final int ringtoneType = 16843257; // 0x10101f9
		field public static final int rotation = 16843558; // 0x1010326
		field public static final int rotationAnimation = 16843688; // 0x10103a8
		field public static final int rotationAnimation = 16844090; // 0x101053a
		field public static final int rotationX = 16843559; // 0x1010327
		field public static final int rotationY = 16843560; // 0x1010328
		field public static final int roundIcon = 16844076; // 0x101052c

api/system-current.txt

+6 −2

Original line number	Diff line number	Diff line
		@@ -900,10 +900,12 @@ package android {
		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 = 16843702; // 0x10103b6
		field public static final int layout_marginHorizontal = 16844091; // 0x101053b
		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 = 16843701; // 0x10103b5
		field public static final int layout_marginTop = 16843000; // 0x10100f8
		field public static final int layout_marginVertical = 16844092; // 0x101053c
		field public static final int layout_row = 16843643; // 0x101037b
		field public static final int layout_rowSpan = 16843644; // 0x101037c
		field public static final int layout_rowWeight = 16843864; // 0x1010458
		@@ -971,7 +973,7 @@ package android {
		field public static final int mediaRouteTypes = 16843694; // 0x10103ae
		field public static final int menuCategory = 16843230; // 0x10101de
		field public static final int mimeType = 16842790; // 0x1010026
		field public static final int min = 16843367; // 0x1010267
		field public static final int min = 16844089; // 0x1010539
		field public static final int minDate = 16843583; // 0x101033f
		field public static final int minEms = 16843098; // 0x101015a
		field public static final int minHeight = 16843072; // 0x1010140
		@@ -1034,11 +1036,13 @@ package android {
		field public static final int padding = 16842965; // 0x10100d5
		field public static final int paddingBottom = 16842969; // 0x10100d9
		field public static final int paddingEnd = 16843700; // 0x10103b4
		field public static final int paddingHorizontal = 16844093; // 0x101053d
		field public static final int paddingLeft = 16842966; // 0x10100d6
		field public static final int paddingMode = 16843863; // 0x1010457
		field public static final int paddingRight = 16842968; // 0x10100d8
		field public static final int paddingStart = 16843699; // 0x10103b3
		field public static final int paddingTop = 16842967; // 0x10100d7
		field public static final int paddingVertical = 16844094; // 0x101053e
		field public static final int panelBackground = 16842846; // 0x101005e
		field public static final int panelColorBackground = 16842849; // 0x1010061
		field public static final int panelColorForeground = 16842848; // 0x1010060
		@@ -1157,7 +1161,7 @@ package android {
		field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093
		field public static final int ringtoneType = 16843257; // 0x10101f9
		field public static final int rotation = 16843558; // 0x1010326
		field public static final int rotationAnimation = 16843688; // 0x10103a8
		field public static final int rotationAnimation = 16844090; // 0x101053a
		field public static final int rotationX = 16843559; // 0x1010327
		field public static final int rotationY = 16843560; // 0x1010328
		field public static final int roundIcon = 16844076; // 0x101052c

api/test-current.txt

+6 −2

Original line number	Diff line number	Diff line
		@@ -793,10 +793,12 @@ package android {
		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 = 16843702; // 0x10103b6
		field public static final int layout_marginHorizontal = 16844091; // 0x101053b
		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 = 16843701; // 0x10103b5
		field public static final int layout_marginTop = 16843000; // 0x10100f8
		field public static final int layout_marginVertical = 16844092; // 0x101053c
		field public static final int layout_row = 16843643; // 0x101037b
		field public static final int layout_rowSpan = 16843644; // 0x101037c
		field public static final int layout_rowWeight = 16843864; // 0x1010458
		@@ -864,7 +866,7 @@ package android {
		field public static final int mediaRouteTypes = 16843694; // 0x10103ae
		field public static final int menuCategory = 16843230; // 0x10101de
		field public static final int mimeType = 16842790; // 0x1010026
		field public static final int min = 16843367; // 0x1010267
		field public static final int min = 16844089; // 0x1010539
		field public static final int minDate = 16843583; // 0x101033f
		field public static final int minEms = 16843098; // 0x101015a
		field public static final int minHeight = 16843072; // 0x1010140
		@@ -927,11 +929,13 @@ package android {
		field public static final int padding = 16842965; // 0x10100d5
		field public static final int paddingBottom = 16842969; // 0x10100d9
		field public static final int paddingEnd = 16843700; // 0x10103b4
		field public static final int paddingHorizontal = 16844093; // 0x101053d
		field public static final int paddingLeft = 16842966; // 0x10100d6
		field public static final int paddingMode = 16843863; // 0x1010457
		field public static final int paddingRight = 16842968; // 0x10100d8
		field public static final int paddingStart = 16843699; // 0x10103b3
		field public static final int paddingTop = 16842967; // 0x10100d7
		field public static final int paddingVertical = 16844094; // 0x101053e
		field public static final int panelBackground = 16842846; // 0x101005e
		field public static final int panelColorBackground = 16842849; // 0x1010061
		field public static final int panelColorForeground = 16842848; // 0x1010060
		@@ -1050,7 +1054,7 @@ package android {
		field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093
		field public static final int ringtoneType = 16843257; // 0x10101f9
		field public static final int rotation = 16843558; // 0x1010326
		field public static final int rotationAnimation = 16843688; // 0x10103a8
		field public static final int rotationAnimation = 16844090; // 0x101053a
		field public static final int rotationX = 16843559; // 0x1010327
		field public static final int rotationY = 16843560; // 0x1010328
		field public static final int roundIcon = 16844076; // 0x101052c

core/java/android/view/View.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -4194,6 +4194,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		int endPadding = UNDEFINED_PADDING;

		int padding = -1;
		int paddingHorizontal = -1;
		int paddingVertical = -1;

		int viewFlagValues = 0;
		int viewFlagMasks = 0;
		@@ -4240,6 +4242,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		leftPaddingDefined = true;
		rightPaddingDefined = true;
		break;
		case com.android.internal.R.styleable.View_paddingHorizontal:
		paddingHorizontal = a.getDimensionPixelSize(attr, -1);
		mUserPaddingLeftInitial = paddingHorizontal;
		mUserPaddingRightInitial = paddingHorizontal;
		leftPaddingDefined = true;
		rightPaddingDefined = true;
		break;
		case com.android.internal.R.styleable.View_paddingVertical:
		paddingVertical = a.getDimensionPixelSize(attr, -1);
		break;
		case com.android.internal.R.styleable.View_paddingLeft:
		leftPadding = a.getDimensionPixelSize(attr, -1);
		mUserPaddingLeftInitial = leftPadding;
		@@ -4647,6 +4659,17 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		bottomPadding = padding;
		mUserPaddingLeftInitial = padding;
		mUserPaddingRightInitial = padding;
		} else {
		if (paddingHorizontal >= 0) {
		leftPadding = paddingHorizontal;
		rightPadding = paddingHorizontal;
		mUserPaddingLeftInitial = paddingHorizontal;
		mUserPaddingRightInitial = paddingHorizontal;
		}
		if (paddingVertical >= 0) {
		topPadding = paddingVertical;
		bottomPadding = paddingVertical;
		}
		}

		if (isRtlCompatibilityMode()) {

core/java/android/view/ViewGroup.java

+40 −26

Original line number	Diff line number	Diff line
		@@ -7356,6 +7356,15 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		topMargin = margin;
		rightMargin= margin;
		bottomMargin = margin;
		} else {
		int horizontalMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginHorizontal, -1);
		int verticalMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginVertical, -1);

		if (horizontalMargin >= 0) {
		leftMargin = horizontalMargin;
		rightMargin = horizontalMargin;
		} else {
		leftMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginLeft,
		@@ -7371,20 +7380,25 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		mMarginFlags \|= RIGHT_MARGIN_UNDEFINED_MASK;
		rightMargin = DEFAULT_MARGIN_RESOLVED;
		}
		startMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginStart,
		DEFAULT_MARGIN_RELATIVE);
		endMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginEnd,
		DEFAULT_MARGIN_RELATIVE);
		}

		if (verticalMargin >= 0) {
		topMargin = verticalMargin;
		bottomMargin = verticalMargin;
		} else {
		topMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginTop,
		DEFAULT_MARGIN_RESOLVED);
		bottomMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginBottom,
		DEFAULT_MARGIN_RESOLVED);

		startMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginStart,
		DEFAULT_MARGIN_RELATIVE);
		endMargin = a.getDimensionPixelSize(
		R.styleable.ViewGroup_MarginLayout_layout_marginEnd,
		DEFAULT_MARGIN_RELATIVE);
		}

		if (isMarginRelative()) {
		mMarginFlags \|= NEED_RESOLUTION_MASK;