summaryrefslogtreecommitdiffstats
path: root/core/java/com/android
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-10-10 16:39:25 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2012-10-10 16:47:51 -0700
commit2918ab6c3258639148b8a5c78a34483af195246e (patch)
tree690da7eacc5e145d0e00c0d63dbf035fa51e7a0d /core/java/com/android
parent64182d8444e5f6c9bdc25d4a7e53fd8439e2303b (diff)
downloadframeworks_base-2918ab6c3258639148b8a5c78a34483af195246e.zip
frameworks_base-2918ab6c3258639148b8a5c78a34483af195246e.tar.gz
frameworks_base-2918ab6c3258639148b8a5c78a34483af195246e.tar.bz2
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
- rename to LayoutParams.resolveLayoutDirection(int) - upate 17.txt too Change-Id: I54fe28dc47cfdb65ef0b5b0244dabbe1d675c781
Diffstat (limited to 'core/java/com/android')
-rw-r--r--core/java/com/android/internal/widget/ActionBarView.java6
1 files changed, 3 insertions, 3 deletions
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;