summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2020-04-10 03:03:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-10 03:03:21 +0000
commitcb437ade00bd23dba1a8ea729bc4ecefd1bc5fbe (patch)
tree4912153b9a9a5191b31522c8b40594a3806f41b2 /core/java/android
parent9454e04c8c33070e161c0a364257616b078c5e21 (diff)
parent8b5d23ab108e80a4c6af5253733c3c6cf504e13f (diff)
Merge changes I7d2ca2a2,I9f1fc593 into rvc-dev
* changes: Fix a couple issues with previous CL (keeping tasks hidden) Keep task hidden until task appeared
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/window/TaskOrganizerTaskEmbedder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/window/TaskOrganizerTaskEmbedder.java b/core/java/android/window/TaskOrganizerTaskEmbedder.java
index 2091c9398e95..39a0101bbf59 100644
--- a/core/java/android/window/TaskOrganizerTaskEmbedder.java
+++ b/core/java/android/window/TaskOrganizerTaskEmbedder.java
@@ -254,7 +254,9 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
mTaskToken = taskInfo.token;
mTaskLeash = mTaskToken.getLeash();
mTransaction.reparent(mTaskLeash, mSurfaceControl)
- .show(mSurfaceControl).apply();
+ .show(mTaskLeash)
+ .show(mSurfaceControl)
+ .apply();
if (mPendingNotifyBoundsChanged) {
// TODO: Either defer show or hide and synchronize show with the resize
notifyBoundsChanged();