am 98603eed: am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2

* commit '98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55':
  Fix bug 4416126 - orientation change bug with action bar overflow menu
This commit is contained in:
Adam Powell
2011-05-17 20:28:06 -07:00
committed by Android Git Automerger

View File

@@ -104,9 +104,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
final int screen = newConfig.screenLayout; mReserveOverflow = newConfig.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
mReserveOverflow = (screen & Configuration.SCREENLAYOUT_SIZE_MASK) ==
Configuration.SCREENLAYOUT_SIZE_XLARGE;
mMaxItems = getMaxActionButtons(); mMaxItems = getMaxActionButtons();
mWidthLimit = getResources().getDisplayMetrics().widthPixels / 2; mWidthLimit = getResources().getDisplayMetrics().widthPixels / 2;
if (mMenu != null) { if (mMenu != null) {