From cc2e5bea7da9339a9c03a9616f22348978e8909c Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Fri, 10 Jun 2011 11:55:06 -0700 Subject: Fix some measurement/sizing with split action bars Change-Id: I5fded370d214eb0a50d06fd6a14446227d3b30ac --- core/java/com/android/internal/app/ActionBarImpl.java | 8 ++------ core/java/com/android/internal/widget/ActionBarView.java | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core/java') diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index c3b1098..8d5df6f 100644 --- a/core/java/com/android/internal/app/ActionBarImpl.java +++ b/core/java/com/android/internal/app/ActionBarImpl.java @@ -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; diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 55849e5..e3286dd 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -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) { -- cgit v1.1