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

am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev

Browse Source 
* commit '69fe1e8e5fef5ceac9aa476995623fe80424019d':
  Update overflow menu alignment to match spec
This commit is contained in:
Alan Viverette
2014-11-21 01:55:19 +00:00
committed by Android Git Automerger
parent c43613becf 69fe1e8e5f
commit 69b802fdb6
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/widget/ActionMenuPresenter.java
View File

@@ -655,15 +655,19 @@ public class ActionMenuPresenter extends BaseMenuPresenter
protected boolean setFrame(int l, int t, int r, int b) { protected boolean setFrame(int l, int t, int r, int b) {
final boolean changed = super.setFrame(l, t, r, b); final boolean changed = super.setFrame(l, t, r, b);
// Set up the hotspot bounds to be centered on the image. // Set up the hotspot bounds to square and centered on the image.
final Drawable d = getDrawable(); final Drawable d = getDrawable();
final Drawable bg = getBackground(); final Drawable bg = getBackground();
if (d != null && bg != null) { if (d != null && bg != null) {
final float[] pts = mTempPts; final int width = getWidth();
pts[0] = d.getBounds().centerX(); final int height = getHeight();
getImageMatrix().mapPoints(pts); final int halfEdge = Math.max(width, height) / 2;
final int offset = (int) pts[0] - getWidth() / 2; final int offsetX = getPaddingLeft() - getPaddingRight();
bg.setHotspotBounds(offset, 0, getWidth() + offset, getHeight()); final int offsetY = getPaddingTop() - getPaddingBottom();
final int centerX = (width + offsetX) / 2;
final int centerY = (height + offsetY) / 2;
bg.setHotspotBounds(centerX - halfEdge, centerY - halfEdge,
centerX + halfEdge, centerY + halfEdge);
} }
return changed; return changed;

4
core/res/res/values/styles_material.xml
View File

@@ -874,8 +874,8 @@ please see styles_device_defaults.xml.
<item name="contentDescription">@string/action_menu_overflow_description</item> <item name="contentDescription">@string/action_menu_overflow_description</item>
<item name="minWidth">@dimen/action_button_min_width_overflow_material</item> <item name="minWidth">@dimen/action_button_min_width_overflow_material</item>
<item name="minHeight">@dimen/action_button_min_height_material</item> <item name="minHeight">@dimen/action_button_min_height_material</item>
<item name="paddingStart">0dp</item> <item name="paddingStart">6dp</item>
<item name="paddingEnd">12dp</item> <item name="paddingEnd">10dp</item>
</style> </style>
<style name="Widget.Material.ActionBar.TabView" parent="Widget.ActionBar.TabView"> <style name="Widget.Material.ActionBar.TabView" parent="Widget.ActionBar.TabView">