Ensure we show the PiP menu in response to KEYCODE_WINDOW.
Bug: 36687605
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testWindowButtonEntersPip
Change-Id: I0bb35fd666eb6a438e4676267f6726b44bffb3db
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 586b3b2..a2ff4f7 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -271,7 +271,7 @@
/**
* Called by System UI to notify of changes to the visibility of PIP.
*/
- oneway void setTvPipVisibility(boolean visible);
+ oneway void setPipVisibility(boolean visible);
/**
* Device has a software navigation bar (separate from the status bar).
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index 2617d45..bb6e0ee 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -1517,7 +1517,7 @@
/**
* Called by System UI to notify of changes to the visibility of PIP.
*/
- public void setTvPipVisibilityLw(boolean visible);
+ void setPipVisibilityLw(boolean visible);
/**
* Specifies whether there is an on-screen navigation bar separate from the status bar.
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 21e39f6..7d9538f 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -102,9 +102,9 @@
void onCameraLaunchGestureDetected(int source);
/**
- * Shows the TV's picture-in-picture menu if an activity is in picture-in-picture mode.
+ * Shows the picture-in-picture menu if an activity is in picture-in-picture mode.
*/
- void showTvPictureInPictureMenu();
+ void showPictureInPictureMenu();
/**
* Shows the global actions menu.