diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2009-10-29 14:02:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 14:02:18 -0700 |
| commit | f545e798ebbe7e081c8e87ad32aa450388364bef (patch) | |
| tree | 1009da12a11ef60278cac2560d6ac2319262438c /services | |
| parent | 29f043d7424a0b1314aa5d5d13fb27ef57aef067 (diff) | |
| parent | 18eedbacac964f200309f99fdfca06a0a01e5bf5 (diff) | |
| download | frameworks_base-f545e798ebbe7e081c8e87ad32aa450388364bef.zip frameworks_base-f545e798ebbe7e081c8e87ad32aa450388364bef.tar.gz frameworks_base-f545e798ebbe7e081c8e87ad32aa450388364bef.tar.bz2 | |
am 18eedbac: am a47a1e77: Merge change Ic03d28b9 into eclair
Merge commit '18eedbacac964f200309f99fdfca06a0a01e5bf5' into eclair-mr2-plus-aosp
* commit '18eedbacac964f200309f99fdfca06a0a01e5bf5':
Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index cd6a371..0f2367d 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -9644,7 +9644,8 @@ public class WindowManagerService extends IWindowManager.Stub WindowState w = (WindowState)mWindows.get(i); if (w.mSurface != null) { final WindowManager.LayoutParams attrs = w.mAttrs; - if (mPolicy.doesForceHide(w, attrs)) { + if (mPolicy.doesForceHide(w, attrs) && w.isVisibleLw()) { + if (DEBUG_FOCUS) Log.i(TAG, "win=" + w + " force hides other windows"); forceHiding = true; } else if (mPolicy.canBeForceHidden(w, attrs)) { if (!w.mAnimating) { |