Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2e5bea authored by Adam Powell's avatar Adam Powell
Browse files

Fix some measurement/sizing with split action bars 

Change-Id: I5fded370d214eb0a50d06fd6a14446227d3b30ac
parent 9e7c2063

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;

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

+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) {

core/res/res/values/styles.xml

+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>