summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-03 14:28:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-03 14:28:18 -0700
commit9f2f3752ae26b6812e0ee33a61dd331b0be673c7 (patch)
tree8d78ff885e853ce922a54f6683d8043916981c88 /core
parent678d344bcb5c7981b5033cdf8070c58783ded01b (diff)
parentc11f6c3e33c9f1e3964cb2427f82509fc97e3527 (diff)
downloadframeworks_base-9f2f3752ae26b6812e0ee33a61dd331b0be673c7.zip
frameworks_base-9f2f3752ae26b6812e0ee33a61dd331b0be673c7.tar.gz
frameworks_base-9f2f3752ae26b6812e0ee33a61dd331b0be673c7.tar.bz2
am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit 'c11f6c3e33c9f1e3964cb2427f82509fc97e3527': 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) {