diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-10 16:39:25 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-10 16:47:51 -0700 |
| commit | 2918ab6c3258639148b8a5c78a34483af195246e (patch) | |
| tree | 690da7eacc5e145d0e00c0d63dbf035fa51e7a0d /core/java/android/widget/RelativeLayout.java | |
| parent | 64182d8444e5f6c9bdc25d4a7e53fd8439e2303b (diff) | |
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
- rename to LayoutParams.resolveLayoutDirection(int)
- upate 17.txt too
Change-Id: I54fe28dc47cfdb65ef0b5b0244dabbe1d675c781
Diffstat (limited to 'core/java/android/widget/RelativeLayout.java')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 455355f195cc..4ca405b4e84d 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); } } |