summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-31 12:34:56 -0800
committerDianne Hackborn <hackbod@google.com>2011-01-31 13:44:14 -0800
commite6c6b760eb0c1068fdfa656007ec27e482313b58 (patch)
tree6a49ccb7b94258a0c1aafa279683a708d69bf0f9
parent113834c5ab30bfc554202d0f3144a662d77f2484 (diff)
downloadbase-e6c6b760eb0c1068fdfa656007ec27e482313b58.tar.gz
DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
The "resizeable" attribute of supports-screens was never well documented, so many apps don't set it. Assuming that if they are explicitly saying they support large or xlarge screens then they are also implying that they are resizeable. Change-Id: Ibce45539d8910dfddb4f548da5464b31ac4a3a89
-rw-r--r--core/java/android/content/res/CompatibilityInfo.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java
index d0ba590159f4..c33c4d688ccd 100644
--- a/core/java/android/content/res/CompatibilityInfo.java
+++ b/core/java/android/content/res/CompatibilityInfo.java
@@ -140,10 +140,16 @@ public class CompatibilityInfo {
appFlags = appInfo.flags;
if ((appInfo.flags & ApplicationInfo.FLAG_SUPPORTS_LARGE_SCREENS) != 0) {
- mCompatibilityFlags |= LARGE_SCREENS | CONFIGURED_LARGE_SCREENS;
+ // Saying you support large screens also implies you support xlarge
+ // screens; there is no compatibility mode for a large app on an
+ // xlarge screen.
+ mCompatibilityFlags |= LARGE_SCREENS | CONFIGURED_LARGE_SCREENS
+ | XLARGE_SCREENS | CONFIGURED_XLARGE_SCREENS
+ | EXPANDABLE | CONFIGURED_EXPANDABLE;
}
if ((appInfo.flags & ApplicationInfo.FLAG_SUPPORTS_XLARGE_SCREENS) != 0) {
- mCompatibilityFlags |= XLARGE_SCREENS | CONFIGURED_XLARGE_SCREENS;
+ mCompatibilityFlags |= XLARGE_SCREENS | CONFIGURED_XLARGE_SCREENS
+ | EXPANDABLE | CONFIGURED_EXPANDABLE;
}
if ((appInfo.flags & ApplicationInfo.FLAG_RESIZEABLE_FOR_SCREENS) != 0) {
mCompatibilityFlags |= EXPANDABLE | CONFIGURED_EXPANDABLE;