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

Commit 345a9f4e authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 3212471 - Widget.Holo.ActionButton style and friends now 76% more useful 

Change-Id: Ideb37c8a31e37df8fcfc549d12b4b6cafc983ca1
parent 21e713d6

core/java/com/android/internal/view/menu/ActionMenuView.java

+2 −14
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo 
    private OverflowMenuButton mOverflowButton;

    private MenuPopupHelper mOverflowPopup;



    private float mButtonPaddingLeft;

    private float mButtonPaddingRight;

    private float mDividerPadding;

    

    private Drawable mDivider;
@@ -94,16 +92,9 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo 
                Configuration.SCREENLAYOUT_SIZE_XLARGE;

        

        TypedArray a = context.obtainStyledAttributes(com.android.internal.R.styleable.Theme);

        final int buttonStyle = a.getResourceId(

                com.android.internal.R.styleable.Theme_actionButtonStyle, 0);

        mDivider = a.getDrawable(com.android.internal.R.styleable.Theme_dividerVertical);

        a.recycle();

        

        a = context.obtainStyledAttributes(buttonStyle, com.android.internal.R.styleable.View);

        mButtonPaddingLeft = a.getDimension(com.android.internal.R.styleable.View_paddingLeft, 0);

        mButtonPaddingRight = a.getDimension(com.android.internal.R.styleable.View_paddingRight, 0);

        a.recycle();

        

        mDividerPadding = DIVIDER_PADDING * res.getDisplayMetrics().density;



        setBaselineAligned(false);
@@ -295,10 +286,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo 
    }



    private LayoutParams makeActionViewLayoutParams(View view) {

        LayoutParams params = generateLayoutParams(view.getLayoutParams());

        params.leftMargin = (int) mButtonPaddingLeft;

        params.rightMargin = (int) mButtonPaddingRight;

        return params;

        return generateLayoutParams(view.getLayoutParams());

    }



    private class OverflowMenuButton extends ImageButton {

core/res/res/layout/action_menu_item_layout.xml

+5 −1
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ 
                 android:layout_height="wrap_content"

                 android:layout_gravity="center"

                 android:visibility="gone"

                 style="?attr/actionButtonStyle" />

                 android:paddingLeft="4dip"

                 android:paddingRight="4dip"

                 android:minHeight="56dip"

                 android:scaleType="center"

                 android:background="@null" />

    <Button android:id="@+id/textButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

core/res/res/values/styles.xml

+3 −4
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ 
    </style>



    <style name="Widget.ActionButton">

        <item name="android:background">@null</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

    </style>
@@ -1651,8 +1651,8 @@ 
    </style>



    <style name="Widget.Holo.ActionButton" parent="Widget.ActionButton">

        <item name="android:paddingLeft">4dip</item>

        <item name="android:paddingRight">4dip</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>
@@ -1981,7 +1981,6 @@ 


    <style name="Widget.Holo.Light.ActionButton.Overflow">

        <item name="android:src">@android:drawable/ic_menu_moreoverflow_holo_light</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

    </style>