Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave" (843c3545) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/ActionBarView.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -1036,6 +1036,8 @@ public class ActionBarView extends AbsActionBarView {
		} else if (centeredLeft + navWidth > menuLeft) {
		hgravity = Gravity.RIGHT;
		}
		} else if (gravity == -1) {
		hgravity = Gravity.LEFT;
		}

		int xpos = 0;
		@@ -1051,8 +1053,14 @@ public class ActionBarView extends AbsActionBarView {
		break;
		}

		int vgravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;

		if (gravity == -1) {
		vgravity = Gravity.CENTER_VERTICAL;
		}

		int ypos = 0;
		switch (gravity & Gravity.VERTICAL_GRAVITY_MASK) {
		switch (vgravity) {
		case Gravity.CENTER_VERTICAL:
		final int paddedTop = getPaddingTop();
		final int paddedBottom = mBottom - mTop - getPaddingBottom();