Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2011-01-06 16:06:48 -08:00
committed by Android (Google) Code Review
parent adba8021cd 345a9f4e6d
commit 5dd6e9a9aa
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/view/menu/ActionMenuView.java
View File

@@ -47,9 +47,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
private boolean mReserveOverflow;
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 {

6
core/res/res/layout/action_menu_item_layout.xml
View File

@@ -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"

7
core/res/res/values/styles.xml
View File

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