diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-26 18:01:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-26 18:01:55 -0700 |
| commit | 68b14054b96571d4009c6c5a9b4c3413d908a523 (patch) | |
| tree | ff41168d20a1117f2e7cedded753d9be886e890a /core/java/android/view | |
| parent | 319c7e85019350e3a5f26c64803900b945130c3b (diff) | |
| parent | bb4b601673a4f910d3e467bc5ce39538438859ce (diff) | |
| download | frameworks_base-68b14054b96571d4009c6c5a9b4c3413d908a523.zip frameworks_base-68b14054b96571d4009c6c5a9b4c3413d908a523.tar.gz frameworks_base-68b14054b96571d4009c6c5a9b4c3413d908a523.tar.bz2 | |
Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index dc73e85..00723f3 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -4816,8 +4816,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed) { final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams(); - final int layoutDirection = getLayoutDirection(); - lp.resolveLayoutDirection(layoutDirection); final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec, mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin |