Merge "Fix some measurement/sizing with split action bars" (679dd99c) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ActionBarImpl.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -156,9 +156,7 @@ public class ActionBarImpl extends ActionBar {
		mContextDisplayMode = mActionView.isSplitActionBar() ?
		CONTEXT_DISPLAY_SPLIT : CONTEXT_DISPLAY_NORMAL;

		TypedArray a = mContext.obtainStyledAttributes(null, R.styleable.ActionBar);
		mContentHeight = a.getLayoutDimension(R.styleable.ActionBar_height, 0);
		a.recycle();
		mContentHeight = mActionView.getContentHeight();
		}

		public void onConfigurationChanged(Configuration newConfig) {
		@@ -179,9 +177,7 @@ public class ActionBarImpl extends ActionBar {
		mActionView.setCollapsable(!mHasEmbeddedTabs &&
		getNavigationMode() == NAVIGATION_MODE_TABS);

		TypedArray a = mContext.obtainStyledAttributes(null, R.styleable.ActionBar);
		mContentHeight = a.getLayoutDimension(R.styleable.ActionBar_height, 0);
		a.recycle();
		mContentHeight = mActionView.getContentHeight();

		if (mTabScrollView != null) {
		mTabScrollView.getLayoutParams().height = mContentHeight;

+4 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,10 @@ public class ActionBarView extends AbsActionBarView {
		requestLayout();
		}

		public int getContentHeight() {
		return mContentHeight;
		}

		public void setSplitActionBar(boolean splitActionBar) {
		if (mSplitActionBar != splitActionBar) {
		if (mMenuView != null) {

+0 −1

Original line number	Diff line number	Diff line
		@@ -1783,7 +1783,6 @@
		<item name="android:gravity">center</item>
		<item name="android:paddingLeft">16dip</item>
		<item name="android:paddingRight">16dip</item>
		<item name="android:minHeight">56dip</item>
		<item name="android:scaleType">center</item>
		</style>