Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev

Browse Source 
* commit '5b04d0320b877693fe10f70773657585c1c4aa58':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
This commit is contained in:
Fabrice Di Meglio
2012-10-10 17:32:47 -07:00
committed by Android Git Automerger
parent c41609408b 5b04d0320b
commit f4a1dad63d
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/17.txt
View File

@@ -25677,7 +25677,7 @@ package android.view {
ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);
ctor public ViewGroup.LayoutParams(int, int);
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);
field public static final deprecated int FILL_PARENT = -1; // 0xffffffff
field public static final int MATCH_PARENT = -1; // 0xffffffff

2
api/current.txt
View File

@@ -25677,7 +25677,7 @@ package android.view {
ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);
ctor public ViewGroup.LayoutParams(int, int);
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);
field public static final deprecated int FILL_PARENT = -1; // 0xffffffff
field public static final int MATCH_PARENT = -1; // 0xffffffff

2
core/java/android/view/View.java
View File

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

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

@@ -5542,7 +5542,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* {@link View#LAYOUT_DIRECTION_LTR}
* {@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.
*/
@Override
public void onResolveLayoutDirection(int layoutDirection) {
public void resolveLayoutDirection(int layoutDirection) {
setLayoutDirection(layoutDirection);
if (!isMarginRelative()) return;

8
core/java/android/widget/RelativeLayout.java
View File

@@ -729,7 +729,7 @@ public class RelativeLayout extends ViewGroup {
final int layoutDirection = getLayoutDirection();
int[] rules = params.getRules(layoutDirection);
params.onResolveLayoutDirection(layoutDirection);
params.resolveLayoutDirection(layoutDirection);
if (params.mLeft < 0 && params.mRight >= 0) {
// Right is fixed, but left varies
@@ -983,7 +983,7 @@ public class RelativeLayout extends ViewGroup {
if (child.getVisibility() != GONE) {
RelativeLayout.LayoutParams st =
(RelativeLayout.LayoutParams) child.getLayoutParams();
st.onResolveLayoutDirection(getLayoutDirection());
st.resolveLayoutDirection(getLayoutDirection());
child.layout(st.mLeft, st.mTop, st.mRight, st.mBottom);
}
}
@@ -1393,7 +1393,7 @@ public class RelativeLayout extends ViewGroup {
}
@Override
public void onResolveLayoutDirection(int layoutDirection) {
public void resolveLayoutDirection(int layoutDirection) {
final boolean isLayoutRtl = isLayoutRtl();
if (isLayoutRtl) {
if (mStart != DEFAULT_RELATIVE) mRight = mStart;
@@ -1407,7 +1407,7 @@ public class RelativeLayout extends ViewGroup {
resolveRules(layoutDirection);
}
// This will set the layout direction
super.onResolveLayoutDirection(layoutDirection);
super.resolveLayoutDirection(layoutDirection);
}
}

6
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -1098,7 +1098,7 @@ public class ActionBarView extends AbsActionBarView {
if (customView != null) {
final int resolvedLayoutDirection = getLayoutDirection();
ViewGroup.LayoutParams lp = customView.getLayoutParams();
lp.onResolveLayoutDirection(resolvedLayoutDirection);
lp.resolveLayoutDirection(resolvedLayoutDirection);
final ActionBar.LayoutParams ablp = lp instanceof ActionBar.LayoutParams ?
(ActionBar.LayoutParams) lp : null;
final int gravity = ablp != null ? ablp.gravity : DEFAULT_CUSTOM_GRAVITY;
@@ -1385,7 +1385,7 @@ public class ActionBarView extends AbsActionBarView {
int upOffset = 0;
if (mUpView.getVisibility() != GONE) {
final LayoutParams upLp = (LayoutParams) mUpView.getLayoutParams();
upLp.onResolveLayoutDirection(layoutDirection);
upLp.resolveLayoutDirection(layoutDirection);
final int upHeight = mUpView.getMeasuredHeight();
final int upWidth = mUpView.getMeasuredWidth();
upOffset = upLp.leftMargin + upWidth + upLp.rightMargin;
@@ -1406,7 +1406,7 @@ public class ActionBarView extends AbsActionBarView {
}
final LayoutParams iconLp = (LayoutParams) mIconView.getLayoutParams();
iconLp.onResolveLayoutDirection(layoutDirection);
iconLp.resolveLayoutDirection(layoutDirection);
final int iconHeight = mIconView.getMeasuredHeight();
final int iconWidth = mIconView.getMeasuredWidth();
final int hCenter = (r - l) / 2;