diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-10 17:26:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 17:26:41 -0700 |
| commit | b8021a88e5c00ebd985a348b56af29c95a178a90 (patch) | |
| tree | eb1bcf1f3cb2185303f1b44966b603ffc5f20ea5 /core/java/com/android | |
| parent | 02f0daa580a3d97f64e126198e42c3247ee37517 (diff) | |
| parent | 2918ab6c3258639148b8a5c78a34483af195246e (diff) | |
| download | frameworks_base-b8021a88e5c00ebd985a348b56af29c95a178a90.zip frameworks_base-b8021a88e5c00ebd985a348b56af29c95a178a90.tar.gz frameworks_base-b8021a88e5c00ebd985a348b56af29c95a178a90.tar.bz2 | |
Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
Diffstat (limited to 'core/java/com/android')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 6 |
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; |