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

1 files changed, 2 insertions, 3 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 64857ed..fc9502c 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;
             }
         }