Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave"

Browse Source
This commit is contained in:
Adam Powell
2011-08-18 13:21:56 -07:00
committed by Android (Google) Code Review
parent 35e8eda7e1 7a2424d041
commit 843c3545d5
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -1036,6 +1036,8 @@ public class ActionBarView extends AbsActionBarView {
} else if (centeredLeft + navWidth > menuLeft) { } else if (centeredLeft + navWidth > menuLeft) {
hgravity = Gravity.RIGHT; hgravity = Gravity.RIGHT;
} }
} else if (gravity == -1) {
hgravity = Gravity.LEFT;
} }
int xpos = 0; int xpos = 0;
@@ -1051,8 +1053,14 @@ public class ActionBarView extends AbsActionBarView {
break; break;
} }
int vgravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;
if (gravity == -1) {
vgravity = Gravity.CENTER_VERTICAL;
}
int ypos = 0; int ypos = 0;
switch (gravity & Gravity.VERTICAL_GRAVITY_MASK) { switch (vgravity) {
case Gravity.CENTER_VERTICAL: case Gravity.CENTER_VERTICAL:
final int paddedTop = getPaddingTop(); final int paddedTop = getPaddingTop();
final int paddedBottom = mBottom - mTop - getPaddingBottom(); final int paddedBottom = mBottom - mTop - getPaddingBottom();