From 5996319de63fe2e3f936301c00910c7358cee7c6 Mon Sep 17 00:00:00 2001 From: Jacqueline Bronger Date: Thu, 5 May 2022 10:43:55 +0200 Subject: [PATCH] Close the TV PiP menu when losing window focus. Bug: 219885877 Test: manual - open a PiP, then long press HOME -> menu should close Change-Id: I20b255f78e9e21a05a8138ef09ab00cce3f2521c --- .../src/com/android/wm/shell/pip/tv/TvPipMenuView.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java index 868e45655ba3c..320c05c4a415a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java @@ -494,6 +494,14 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener { setFrameHighlighted(false); } + @Override + public void onWindowFocusChanged(boolean hasWindowFocus) { + super.onWindowFocusChanged(hasWindowFocus); + if (!hasWindowFocus) { + hideAllUserControls(); + } + } + private void animateAlphaTo(float alpha, View view) { if (view.getAlpha() == alpha) { return;