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

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

Define measuring behavior for action bar/context mode custom views 

Change-Id: Idbe25c81a16005f153d5b425fb366eef4bea290f
parent 3dcfeac8

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

+20 −2
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import android.view.Menu; 
import android.view.MenuItem;

import android.view.View;

import android.view.ViewGroup;

import android.view.View.MeasureSpec;

import android.view.ViewGroup.LayoutParams;

import android.widget.ImageButton;

import android.widget.LinearLayout;

import android.widget.TextView;
@@ -170,6 +172,13 @@ public class ActionBarContextView extends ViewGroup { 
        mCustomView = null;

    }



    @Override

    protected LayoutParams generateDefaultLayoutParams() {

        // Used by custom views if they don't supply layout params. Everything else

        // added to an ActionBarContextView should have them already.

        return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
@@ -212,8 +221,17 @@ public class ActionBarContextView extends ViewGroup { 
        }



        if (mCustomView != null) {

            mCustomView.measure(MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.EXACTLY),

                    MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));

            LayoutParams lp = mCustomView.getLayoutParams();

            final int customWidthMode = lp.width != LayoutParams.WRAP_CONTENT ?

                    MeasureSpec.EXACTLY : MeasureSpec.AT_MOST;

            final int customWidth = lp.width >= 0 ?

                    Math.min(lp.width, availableWidth) : availableWidth;

            final int customHeightMode = lp.height != LayoutParams.WRAP_CONTENT ?

                    MeasureSpec.EXACTLY : MeasureSpec.AT_MOST;

            final int customHeight = lp.height >= 0 ?

                    Math.min(lp.height, height) : height;

            mCustomView.measure(MeasureSpec.makeMeasureSpec(customWidth, customWidthMode),

                    MeasureSpec.makeMeasureSpec(customHeight, customHeightMode));

        }



        setMeasuredDimension(contentWidth, mContentHeight);

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

+28 −16
Original line number Diff line number Diff line
@@ -281,13 +281,9 @@ public class ActionBarView extends ViewGroup { 
                mSpinner = new Spinner(mContext, null,

                        com.android.internal.R.attr.dropDownSpinnerStyle);

                mSpinner.setOnItemSelectedListener(mNavItemSelectedListener);

                mSpinner.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,

                        LayoutParams.WRAP_CONTENT));

                addView(mSpinner);

                break;

            case ActionBar.NAVIGATION_MODE_CUSTOM:

                mCustomNavView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,

                        LayoutParams.WRAP_CONTENT));

                addView(mCustomNavView);

                break;

            }
@@ -312,6 +308,13 @@ public class ActionBarView extends ViewGroup { 
        return mDisplayOptions;

    }



    @Override

    protected LayoutParams generateDefaultLayoutParams() {

        // Used by custom nav views if they don't supply layout params. Everything else

        // added to an ActionBarView should have them already.

        return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();
@@ -419,15 +422,24 @@ public class ActionBarView extends ViewGroup { 
        case ActionBar.NAVIGATION_MODE_DROPDOWN_LIST:

            if (mSpinner != null) {

                mSpinner.measure(

                        MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.EXACTLY),

                        MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST),

                        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));

            }

            break;

        case ActionBar.NAVIGATION_MODE_CUSTOM:

            if (mCustomNavView != null) {

                LayoutParams lp = mCustomNavView.getLayoutParams();

                final int customNavWidthMode = lp.width != LayoutParams.WRAP_CONTENT ?

                        MeasureSpec.EXACTLY : MeasureSpec.AT_MOST;

                final int customNavWidth = lp.width >= 0 ?

                        Math.min(lp.width, availableWidth) : availableWidth;

                final int customNavHeightMode = lp.height != LayoutParams.WRAP_CONTENT ?

                        MeasureSpec.EXACTLY : MeasureSpec.AT_MOST;

                final int customNavHeight = lp.height >= 0 ?

                        Math.min(lp.height, height) : height;

                mCustomNavView.measure(

                        MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.EXACTLY),

                        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));

                        MeasureSpec.makeMeasureSpec(customNavWidth, customNavWidthMode),

                        MeasureSpec.makeMeasureSpec(customNavHeight, customNavHeightMode));

            }

            break;

        }