diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-01 16:44:12 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-10-01 16:44:12 -0700 |
| commit | 27dec99148c9d1cddb99269b131d8220098dc79f (patch) | |
| tree | cd56b327e79f7f73800516e1992f9729ce436c90 /policy | |
| parent | 6486196c303c525b041b380e853e1d2135180239 (diff) | |
| parent | 4d28e8c5c69fe81849b1b450f9af38b053079d97 (diff) | |
| download | frameworks_base-27dec99148c9d1cddb99269b131d8220098dc79f.zip frameworks_base-27dec99148c9d1cddb99269b131d8220098dc79f.tar.gz frameworks_base-27dec99148c9d1cddb99269b131d8220098dc79f.tar.bz2 | |
resolved conflicts for merge of 4d28e8c5 to master
Change-Id: I2449488a84e44b3fb5f820b50951b2b2bfa3bcbf
Diffstat (limited to 'policy')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index bdf24d6..c70f5d4 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1550,7 +1550,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } if (attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW - && win.fillsScreenLw(mW, mH, false, false)) { + && attrs.x == 0 && attrs.y == 0 + && attrs.width == WindowManager.LayoutParams.MATCH_PARENT + && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) { if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win); mTopFullscreenOpaqueWindowState = win; if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) { |