diff options
| author | Adam Powell <adamp@google.com> | 2011-06-10 11:59:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-10 11:59:03 -0700 |
| commit | 679dd99cdce72683816e6ac75e4f0e68ca6ad51c (patch) | |
| tree | 80f842a9986aca26f208da721e72e6a63c746c9c /core/java | |
| parent | 08b992c88e60a95b629a70cd197b3d3b9b27fb8d (diff) | |
| parent | cc2e5bea7da9339a9c03a9616f22348978e8909c (diff) | |
| download | frameworks_base-679dd99cdce72683816e6ac75e4f0e68ca6ad51c.zip frameworks_base-679dd99cdce72683816e6ac75e4f0e68ca6ad51c.tar.gz frameworks_base-679dd99cdce72683816e6ac75e4f0e68ca6ad51c.tar.bz2 | |
Merge "Fix some measurement/sizing with split action bars"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/app/ActionBarImpl.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 4 |
2 files changed, 6 insertions, 6 deletions
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) { |