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

Make sure action bar context modes reserve space for overflow menus on all devices.

Browse Source 
Change-Id: I393f041efef3852b7f3ee57c6a4c26ba176b2702
This commit is contained in:
Adam Powell
2010-07-20 14:26:38 -07:00
parent 7bb66f3245
commit b366bbae2b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,10 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
return mReserveOverflow;
}
public void setOverflowReserved(boolean reserveOverflow) {
mReserveOverflow = reserveOverflow;
}
@Override
protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
if (p instanceof LayoutParams) {

7
core/java/com/android/internal/widget/ActionBarContextView.java
View File

@@ -25,7 +25,6 @@ import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
@@ -53,7 +52,7 @@ public class ActionBarContextView extends ViewGroup {
private TextView mTitleView;
private TextView mSubtitleView;
private Drawable mCloseDrawable;
private View mMenuView;
private ActionMenuView mMenuView;
public ActionBarContextView(Context context) {
this(context, null, 0);
@@ -150,7 +149,9 @@ public class ActionBarContextView extends ViewGroup {
addView(mCloseButton);
final MenuBuilder menu = (MenuBuilder) mode.getMenu();
mMenuView = menu.getMenuView(MenuBuilder.TYPE_ACTION_BUTTON, this);
mMenuView = (ActionMenuView) menu.getMenuView(MenuBuilder.TYPE_ACTION_BUTTON, this);
mMenuView.setOverflowReserved(true);
mMenuView.updateChildren(false);
addView(mMenuView);
}