diff options
| author | 2011-06-10 11:59:03 -0700 | |
|---|---|---|
| committer | 2011-06-10 11:59:03 -0700 | |
| commit | 679dd99cdce72683816e6ac75e4f0e68ca6ad51c (patch) | |
| tree | 80f842a9986aca26f208da721e72e6a63c746c9c | |
| parent | 08b992c88e60a95b629a70cd197b3d3b9b27fb8d (diff) | |
| parent | cc2e5bea7da9339a9c03a9616f22348978e8909c (diff) | |
Merge "Fix some measurement/sizing with split action bars"
| -rw-r--r-- | core/java/com/android/internal/app/ActionBarImpl.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index c3b1098964e5..8d5df6f96714 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 55849e577f80..e3286dda28a3 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) { diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index dc86626ac5fc..19b05c9489ef 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -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> |