diff options
| author | Craig Mautner <cmautner@google.com> | 2014-01-27 09:21:32 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-02-04 15:10:13 -0800 |
| commit | df88d73092c62a1a3cd2b2056ca63ae2e70cc238 (patch) | |
| tree | a4973477eb7616223780ae0d63e7be8bc9880b88 /services/core/java/com/android/server/wm/DimLayer.java | |
| parent | 70f908d7af916bf0e5b6af2913752dca431b837f (diff) | |
| download | frameworks_base-df88d73092c62a1a3cd2b2056ca63ae2e70cc238.zip frameworks_base-df88d73092c62a1a3cd2b2056ca63ae2e70cc238.tar.gz frameworks_base-df88d73092c62a1a3cd2b2056ca63ae2e70cc238.tar.bz2 | |
Add IIntentSender to ActivityContainer.startActivity
PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.
Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.
Fixes bug 12747909.
Change-Id: I509007ee23fda400b353f483cf6ecce08177763b
Diffstat (limited to 'services/core/java/com/android/server/wm/DimLayer.java')
| -rw-r--r-- | services/core/java/com/android/server/wm/DimLayer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/DimLayer.java b/services/core/java/com/android/server/wm/DimLayer.java index 978d5b7..30eaf45 100644 --- a/services/core/java/com/android/server/wm/DimLayer.java +++ b/services/core/java/com/android/server/wm/DimLayer.java @@ -51,9 +51,9 @@ public class DimLayer { /** Owning stack */ final TaskStack mStack; - DimLayer(WindowManagerService service, TaskStack stack) { + DimLayer(WindowManagerService service, TaskStack stack, DisplayContent displayContent) { mStack = stack; - mDisplayContent = stack.getDisplayContent(); + mDisplayContent = displayContent; final int displayId = mDisplayContent.getDisplayId(); if (DEBUG) Slog.v(TAG, "Ctor: displayId=" + displayId); SurfaceControl.openTransaction(); |