summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/res
diff options
context:
space:
mode:
authorMitsuru Oshima <oshima@google.com>2009-07-19 21:14:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-19 21:14:56 -0700
commita065b01904d5017232c9b51ccb174412ff57e138 (patch)
tree35e9fc7aaf8a0149374c5c3260106828b1991824 /core/java/android/content/res
parentbec99bffeecacb1af603966391014895f9a16025 (diff)
parent841f13c8e9ff3f7695b6c18a8abcec3c947983ff (diff)
downloadframeworks_base-a065b01904d5017232c9b51ccb174412ff57e138.zip
frameworks_base-a065b01904d5017232c9b51ccb174412ff57e138.tar.gz
frameworks_base-a065b01904d5017232c9b51ccb174412ff57e138.tar.bz2
am 841f13c8: * Reverted the change in PackageParser that I checked by accident * More surface view fix. - correct event translation on surface view. - use compatible window * removed FLAG_NO_COMPATIBILITY_SCALE. It was my misunderstanding of how SurfaceView works,
Merge commit '841f13c8e9ff3f7695b6c18a8abcec3c947983ff' * commit '841f13c8e9ff3f7695b6c18a8abcec3c947983ff': * Reverted the change in PackageParser that I checked by accident
Diffstat (limited to 'core/java/android/content/res')
-rw-r--r--core/java/android/content/res/CompatibilityInfo.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java
index 25e7a68..6e34cc8 100644
--- a/core/java/android/content/res/CompatibilityInfo.java
+++ b/core/java/android/content/res/CompatibilityInfo.java
@@ -224,8 +224,7 @@ public class CompatibilityInfo {
if (DBG) Log.d(TAG, "no translation required");
return null;
}
- if (!isScalingRequired() ||
- (params.flags & WindowManager.LayoutParams.FLAG_NO_COMPATIBILITY_SCALING) != 0) {
+ if (!isScalingRequired()) {
return null;
}
return new Translator();