diff options
| author | Romain Guy <romainguy@android.com> | 2010-03-17 12:45:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-17 12:45:39 -0700 |
| commit | 8dd9b6053c801362d8f0be68e77e6a0392ebc486 (patch) | |
| tree | f0685d3a88187f219f513c5cbb91637a80cfdd70 /core/java/android/widget | |
| parent | 41696d379f0e81157d701179580f793ab00a5f0e (diff) | |
| parent | b954a54350a0acd3c24257da1a224f3da941602a (diff) | |
| download | frameworks_base-8dd9b6053c801362d8f0be68e77e6a0392ebc486.zip frameworks_base-8dd9b6053c801362d8f0be68e77e6a0392ebc486.tar.gz frameworks_base-8dd9b6053c801362d8f0be68e77e6a0392ebc486.tar.bz2 | |
Merge "Fix centering in FrameLayout when margins are specified."
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 65a4673..e27bb4f 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -304,8 +304,8 @@ public class FrameLayout extends ViewGroup { childLeft = parentLeft + lp.leftMargin; break; case Gravity.CENTER_HORIZONTAL: - childLeft = parentLeft + (parentRight - parentLeft + lp.leftMargin + - lp.rightMargin - width) / 2; + childLeft = parentLeft + (parentRight - parentLeft - width) / 2 + + lp.leftMargin - lp.rightMargin; break; case Gravity.RIGHT: childLeft = parentRight - width - lp.rightMargin; @@ -319,8 +319,8 @@ public class FrameLayout extends ViewGroup { childTop = parentTop + lp.topMargin; break; case Gravity.CENTER_VERTICAL: - childTop = parentTop + (parentBottom - parentTop + lp.topMargin + - lp.bottomMargin - height) / 2; + childTop = parentTop + (parentBottom - parentTop - height) / 2 + + lp.topMargin - lp.bottomMargin; break; case Gravity.BOTTOM: childTop = parentBottom - height - lp.bottomMargin; |