commit c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa
author Dianne Hackborn <hackbod@google.com> Sat Jan 29 22:20:05 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 29 22:20:05 2011 -0800
tree 009a13cf996c8ed2f4f1e305c174946747bc3e93
parent 1358b6a4fb68e81058aa938e46b125350bdf0fff
parent 726318b56a6c4736caa97c18b1e6b9af800130c9

Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index f28bae0..efd0bb4 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -5029,13 +5029,13 @@
                     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?