From 9f69b78eb30d3f190146901ffbf9f7854cc09f60 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 16 May 2017 15:27:49 -0700 Subject: Workaround issue with pip overlay not hiding cleanly. - We were just finishing the activity which was causing issues with the wrong app transition being applied. We actually can just hide the menu activity first before finishing it like we do elsewhere. Bug: 38222481 Test: Open PiP, launch to show assistant Change-Id: I348f8a17f76006bcef46fe01c87deae0b89f6586 --- .../SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java index 766914c5a99a..824f4a7f6e62 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java @@ -221,9 +221,9 @@ public class PipMenuActivity extends Activity { protected void onUserLeaveHint() { super.onUserLeaveHint(); - // If another task is starting on top of the menu, then finish it so that it can be + // If another task is starting on top of the menu, then hide and finish it so that it can be // recreated on the top next time it starts - finish(); + hideMenu(); } @Override -- cgit v1.2.3-59-g8ed1b