Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper."

Browse Source 
Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp

* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
  Allow two SurfaceViews inbetween the app and the wallpaper.
This commit is contained in:
Jean-Baptiste Queru
2010-09-10 15:47:34 -07:00
committed by Android Git Automerger
parent d77b0dfdf3 962e482606
commit 03821dc6ea
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/java/com/android/server/WindowManagerService.java
View File

@@ -1482,6 +1482,7 @@ public class WindowManagerService extends IWindowManager.Stub
WindowState wb = localmWindows.get(foundI-1); WindowState wb = localmWindows.get(foundI-1);
if (wb.mBaseLayer < maxLayer && if (wb.mBaseLayer < maxLayer &&
wb.mAttachedWindow != foundW && wb.mAttachedWindow != foundW &&
wb.mAttachedWindow != foundW.mAttachedWindow &&
(wb.mAttrs.type != TYPE_APPLICATION_STARTING || (wb.mAttrs.type != TYPE_APPLICATION_STARTING ||
wb.mToken != foundW.mToken)) { wb.mToken != foundW.mToken)) {
// This window is not related to the previous one in any // This window is not related to the previous one in any