diff options
author | Adam Powell <adamp@google.com> | 2014-03-17 19:10:43 -0700 |
---|---|---|
committer | Adam Powell <adamp@google.com> | 2014-04-04 10:08:17 -0700 |
commit | e43340c80dc66c45edc793ecd0343774aa34d108 (patch) | |
tree | 6a3f96a7b59d7fdd5efd45bedb666371dfaef249 /core/java/android/widget/ActionMenuPresenter.java | |
parent | fc35dfd513677ca01e8d4950ff9faa4ed19e65fe (diff) | |
download | frameworks_base-e43340c80dc66c45edc793ecd0343774aa34d108.zip frameworks_base-e43340c80dc66c45edc793ecd0343774aa34d108.tar.gz frameworks_base-e43340c80dc66c45edc793ecd0343774aa34d108.tar.bz2 |
android.widget.Toolbar
Add the new Toolbar widget for use in app layouts.
ActionBar can now be used as a point of control for either a
traditional window decor action bar or for a Toolbar that appears
inline in an Activity's layout.
ToolbarActionBar is currently WIP.
Change-Id: I0da093e5645840f4fd032aa34efa0ae5f1825ff2
Diffstat (limited to 'core/java/android/widget/ActionMenuPresenter.java')
-rw-r--r-- | core/java/android/widget/ActionMenuPresenter.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/java/android/widget/ActionMenuPresenter.java b/core/java/android/widget/ActionMenuPresenter.java index 1f405a7..e4575e5 100644 --- a/core/java/android/widget/ActionMenuPresenter.java +++ b/core/java/android/widget/ActionMenuPresenter.java @@ -640,16 +640,6 @@ public class ActionMenuPresenter extends BaseMenuPresenter } @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) { - // Fill available height - heightMeasureSpec = MeasureSpec.makeMeasureSpec( - MeasureSpec.getSize(heightMeasureSpec), MeasureSpec.EXACTLY); - } - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - } - - @Override public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(info); info.setCanOpenPopup(true); |