From b07f943273a06383b4ab81793cbb6292f3d1586a Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Mon, 16 May 2011 13:41:24 -0700 Subject: DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge. ICS will have a more intelligent way of determining this. Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d --- core/java/com/android/internal/view/menu/ActionMenuView.java | 5 ++--- policy/src/com/android/internal/policy/impl/PhoneWindow.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/java/com/android/internal/view/menu/ActionMenuView.java b/core/java/com/android/internal/view/menu/ActionMenuView.java index 7775f00a50a4..b49fdc596c29 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuView.java +++ b/core/java/com/android/internal/view/menu/ActionMenuView.java @@ -88,9 +88,8 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo mMaxItems = getMaxActionButtons(); // TODO There has to be a better way to indicate that we don't have a hard menu key. - final int screen = res.getConfiguration().screenLayout; - mReserveOverflow = (screen & Configuration.SCREENLAYOUT_SIZE_MASK) == - Configuration.SCREENLAYOUT_SIZE_XLARGE; + final Configuration config = res.getConfiguration(); + mReserveOverflow = config.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE); mWidthLimit = res.getDisplayMetrics().widthPixels / 2; TypedArray a = context.obtainStyledAttributes(com.android.internal.R.styleable.Theme); diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 64857edb3668..fc9502ce464b 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -450,12 +450,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (st.featureId == FEATURE_OPTIONS_PANEL) { Context context = getContext(); Configuration config = context.getResources().getConfiguration(); - boolean isXLarge = (config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == - Configuration.SCREENLAYOUT_SIZE_XLARGE; boolean isHoneycombApp = context.getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.HONEYCOMB; - if (isXLarge && isHoneycombApp) { + if (isHoneycombApp && + config.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)) { return; } } -- cgit v1.2.3-59-g8ed1b