am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master

2010-05-05 18:16:31 -07:00
parent ca0e01c439 8b270a7a77
commit 108817f3d8
8 changed files with 43 additions and 6 deletions
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -11314,6 +11314,7 @@ public class WindowManagerService extends IWindowManager.Stub
                            "DimSurface",
                            -1, 16, 16, PixelFormat.OPAQUE,
                            Surface.FX_SURFACE_DIM);
+                    mDimSurface.setAlpha(0.0f);
                } catch (Exception e) {
                    Slog.e(TAG, "Exception creating Dim surface", e);
                }