summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-29 22:20:05 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-29 22:20:05 -0800
commitc12cdda949e6b916dd9e6fa4b30ab8b0d1898faa (patch)
tree009a13cf996c8ed2f4f1e305c174946747bc3e93
parent1358b6a4fb68e81058aa938e46b125350bdf0fff (diff)
parent726318b56a6c4736caa97c18b1e6b9af800130c9 (diff)
downloadbase-c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa.tar.gz
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
-rw-r--r--services/java/com/android/server/WindowManagerService.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index f28bae073a4d..efd0bb49dc1b 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -5029,13 +5029,13 @@ public class WindowManagerService extends IWindowManager.Stub
mScreenLayout = Configuration.SCREENLAYOUT_SIZE_LARGE;
} else {
mScreenLayout = Configuration.SCREENLAYOUT_SIZE_NORMAL;
-
- // If this screen is wider than normal HVGA, or taller
- // than FWVGA, then for old apps we want to run in size
- // compatibility mode.
- if (shortSize > 321 || longSize > 570) {
- mScreenLayout |= Configuration.SCREENLAYOUT_COMPAT_NEEDED;
- }
+ }
+
+ // If this screen is wider than normal HVGA, or taller
+ // than FWVGA, then for old apps we want to run in size
+ // compatibility mode.
+ if (shortSize > 321 || longSize > 570) {
+ mScreenLayout |= Configuration.SCREENLAYOUT_COMPAT_NEEDED;
}
// Is this a long screen?