summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-01 12:47:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-01 12:47:29 -0700
commit7cae137ed155f2d311f020bbb3e75730344fd5fc (patch)
tree1f8e4a3332bbb8f99a59019df5879957ae26f251 /core
parent13e2bef4f67c5bc5ce93aade1431ae3332d361f0 (diff)
parent79841acb6275348b4747d30bae6d813e15b1425d (diff)
downloadframeworks_base-7cae137ed155f2d311f020bbb3e75730344fd5fc.zip
frameworks_base-7cae137ed155f2d311f020bbb3e75730344fd5fc.tar.gz
frameworks_base-7cae137ed155f2d311f020bbb3e75730344fd5fc.tar.bz2
am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit '79841acb6275348b4747d30bae6d813e15b1425d': Compatibility mode never needed for normal size screens.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/res/CompatibilityInfo.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java
index b7b6de6..0d2e567 100644
--- a/core/java/android/content/res/CompatibilityInfo.java
+++ b/core/java/android/content/res/CompatibilityInfo.java
@@ -199,6 +199,9 @@ public class CompatibilityInfo implements Parcelable {
} else if (!anyResizeable) {
compatFlags |= ALWAYS_NEEDS_COMPAT;
}
+ } else {
+ compatFlags &= ~NEEDS_SCREEN_COMPAT;
+ compatFlags |= NEVER_NEEDS_COMPAT;
}
if ((appInfo.flags & ApplicationInfo.FLAG_SUPPORTS_SCREEN_DENSITIES) != 0) {