summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2020-04-04 18:06:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-04 18:06:04 +0000
commit17849976da46cc90a50d5498109980e31e1900bb (patch)
treeff2b87f21d386d6a7403d28216b6028bbcaabeb3 /core/java/android
parent4c29b73bcb5469d3252d942669f42c8d74b2d77a (diff)
parentcbd8793a441bc828ec22dda09145134da7105818 (diff)
Merge "Keep task hidden until task appeared" into rvc-dev
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();