diff options
-rw-r--r-- | api/17.txt | 2 | ||||
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | core/java/android/view/View.java | 2 | ||||
-rw-r--r-- | core/java/android/view/ViewGroup.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/RelativeLayout.java | 8 | ||||
-rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 6 |
6 files changed, 12 insertions, 12 deletions
@@ -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 diff --git a/api/current.txt b/api/current.txt index bebd566..9d35348 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 0d76eac..22243b1 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -10000,7 +10000,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ private void resolveLayoutParams() { if (mLayoutParams != null) { - mLayoutParams.onResolveLayoutDirection(getLayoutDirection()); + mLayoutParams.resolveLayoutDirection(getLayoutDirection()); } } diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index db1c00a..6436059 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -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; diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 455355f..4ca405b 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -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); } } diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 991c699..5a7f10c 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -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; |