am b8021a88: Merge "Fix bug #7326778 Rename... (5b04d032) · Commits · e / os / android_frameworks_base

api/17.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25677,7 +25677,7 @@ package android.view {
	ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);		ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);
	ctor public ViewGroup.LayoutParams(int, int);		ctor public ViewGroup.LayoutParams(int, int);
	ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);		ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);
	method public void onResolveLayoutDirection(int);		method public void resolveLayoutDirection(int);
	method protected void setBaseAttributes(android.content.res.TypedArray, int, int);		method protected void setBaseAttributes(android.content.res.TypedArray, int, int);
	field public static final deprecated int FILL_PARENT = -1; // 0xffffffff		field public static final deprecated int FILL_PARENT = -1; // 0xffffffff
	field public static final int MATCH_PARENT = -1; // 0xffffffff		field public static final int MATCH_PARENT = -1; // 0xffffffff

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25696,7 +25696,7 @@ package android.view {
	ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);		ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);
	ctor public ViewGroup.LayoutParams(int, int);		ctor public ViewGroup.LayoutParams(int, int);
	ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);		ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);
	method public void onResolveLayoutDirection(int);		method public void resolveLayoutDirection(int);
	method protected void setBaseAttributes(android.content.res.TypedArray, int, int);		method protected void setBaseAttributes(android.content.res.TypedArray, int, int);
	field public static final deprecated int FILL_PARENT = -1; // 0xffffffff		field public static final deprecated int FILL_PARENT = -1; // 0xffffffff
	field public static final int MATCH_PARENT = -1; // 0xffffffff		field public static final int MATCH_PARENT = -1; // 0xffffffff

core/java/android/view/View.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10000,7 +10000,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	*/		*/
	private void resolveLayoutParams() {		private void resolveLayoutParams() {
	if (mLayoutParams != null) {		if (mLayoutParams != null) {
	mLayoutParams.onResolveLayoutDirection(getLayoutDirection());		mLayoutParams.resolveLayoutDirection(getLayoutDirection());
	}		}
	}		}

core/java/android/view/ViewGroup.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5542,7 +5542,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	* {@link View#LAYOUT_DIRECTION_LTR}		* {@link View#LAYOUT_DIRECTION_LTR}
	* {@link View#LAYOUT_DIRECTION_RTL}		* {@link View#LAYOUT_DIRECTION_RTL}
	*/		*/
	public void onResolveLayoutDirection(int layoutDirection) {		public void resolveLayoutDirection(int layoutDirection) {
	}		}

	/**		/**
	@@ -5886,7 +5886,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	* may be overridden depending on layout direction.		* may be overridden depending on layout direction.
	*/		*/
	@Override		@Override
	public void onResolveLayoutDirection(int layoutDirection) {		public void resolveLayoutDirection(int layoutDirection) {
	setLayoutDirection(layoutDirection);		setLayoutDirection(layoutDirection);

	if (!isMarginRelative()) return;		if (!isMarginRelative()) return;

core/java/android/widget/RelativeLayout.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -729,7 +729,7 @@ public class RelativeLayout extends ViewGroup {

	final int layoutDirection = getLayoutDirection();		final int layoutDirection = getLayoutDirection();
	int[] rules = params.getRules(layoutDirection);		int[] rules = params.getRules(layoutDirection);
	params.onResolveLayoutDirection(layoutDirection);		params.resolveLayoutDirection(layoutDirection);

	if (params.mLeft < 0 && params.mRight >= 0) {		if (params.mLeft < 0 && params.mRight >= 0) {
	// Right is fixed, but left varies		// Right is fixed, but left varies
	@@ -983,7 +983,7 @@ public class RelativeLayout extends ViewGroup {
	if (child.getVisibility() != GONE) {		if (child.getVisibility() != GONE) {
	RelativeLayout.LayoutParams st =		RelativeLayout.LayoutParams st =
	(RelativeLayout.LayoutParams) child.getLayoutParams();		(RelativeLayout.LayoutParams) child.getLayoutParams();
	st.onResolveLayoutDirection(getLayoutDirection());		st.resolveLayoutDirection(getLayoutDirection());
	child.layout(st.mLeft, st.mTop, st.mRight, st.mBottom);		child.layout(st.mLeft, st.mTop, st.mRight, st.mBottom);
	}		}
	}		}
	@@ -1393,7 +1393,7 @@ public class RelativeLayout extends ViewGroup {
	}		}

	@Override		@Override
	public void onResolveLayoutDirection(int layoutDirection) {		public void resolveLayoutDirection(int layoutDirection) {
	final boolean isLayoutRtl = isLayoutRtl();		final boolean isLayoutRtl = isLayoutRtl();
	if (isLayoutRtl) {		if (isLayoutRtl) {
	if (mStart != DEFAULT_RELATIVE) mRight = mStart;		if (mStart != DEFAULT_RELATIVE) mRight = mStart;
	@@ -1407,7 +1407,7 @@ public class RelativeLayout extends ViewGroup {
	resolveRules(layoutDirection);		resolveRules(layoutDirection);
	}		}
	// This will set the layout direction		// This will set the layout direction
	super.onResolveLayoutDirection(layoutDirection);		super.resolveLayoutDirection(layoutDirection);
	}		}
	}		}