diff options
| author | Adam Powell <adamp@google.com> | 2011-05-16 13:41:24 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-05-16 13:46:38 -0700 |
| commit | b07f943273a06383b4ab81793cbb6292f3d1586a (patch) | |
| tree | 046e1515d27d56f78fd599f2f29efd5ee153794f /policy/src/com/android | |
| parent | 084d3490a5283088426058d3c15532b176367926 (diff) | |
| download | frameworks_base-b07f943273a06383b4ab81793cbb6292f3d1586a.zip frameworks_base-b07f943273a06383b4ab81793cbb6292f3d1586a.tar.gz frameworks_base-b07f943273a06383b4ab81793cbb6292f3d1586a.tar.bz2 | |
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
Diffstat (limited to 'policy/src/com/android')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 5 |
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; } } |