Merge "Don't flip action bar main content and tabs" (3e0a4633) · Commits · e / os / android_frameworks_base

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

+1 −17

Original line number	Diff line number	Diff line
		@@ -296,24 +296,8 @@ public class ActionBarContainer extends FrameLayout {
		if (mTabContainer != null && mTabContainer.getVisibility() != GONE) {
		final int containerHeight = getMeasuredHeight();
		final int tabHeight = mTabContainer.getMeasuredHeight();

		if ((mActionBarView.getDisplayOptions() & ActionBar.DISPLAY_SHOW_HOME) == 0) {
		// Not showing home, put tabs on top.
		final int count = getChildCount();
		for (int i = 0; i < count; i++) {
		final View child = getChildAt(i);

		if (child == mTabContainer) continue;

		if (!mActionBarView.isCollapsed()) {
		child.offsetTopAndBottom(tabHeight);
		}
		}
		mTabContainer.layout(l, 0, r, tabHeight);
		} else {
		mTabContainer.layout(l, containerHeight - tabHeight, r, containerHeight);
		}
		}

		boolean needsInvalidate = false;
		if (mIsSplit) {