summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-01 12:51:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-01 12:51:08 -0700
commitc11f6c3e33c9f1e3964cb2427f82509fc97e3527 (patch)
treeba3a2fb6c5e8ba742c0c7208918f615a81d2f07d /core
parentb9e2f68b2865307db25fa7295b7ba3bd51c7521a (diff)
parent7cae137ed155f2d311f020bbb3e75730344fd5fc (diff)
downloadframeworks_base-c11f6c3e33c9f1e3964cb2427f82509fc97e3527.zip
frameworks_base-c11f6c3e33c9f1e3964cb2427f82509fc97e3527.tar.gz
frameworks_base-c11f6c3e33c9f1e3964cb2427f82509fc97e3527.tar.bz2
am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit '7cae137ed155f2d311f020bbb3e75730344fd5fc': 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) {