diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-03-31 23:07:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-31 23:07:23 +0000 |
| commit | 2af994ec034040a69e41cc89df7ed6b994aaad89 (patch) | |
| tree | 35fe0ec28dc08a4b53745ee167907e881f9cfc19 /core/java | |
| parent | 4eb9a6dbcb7775f833aa9a66dd14b39295f7136a (diff) | |
| parent | ac52f2892d5c72c26387d510093ddfc741a8a632 (diff) | |
Merge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/statusbar/IStatusBar.aidl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 586b3b225fef..a2ff4f787b61 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -271,7 +271,7 @@ interface IWindowManager /** * 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 2617d45a6a02..bb6e0eed57cc 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -1517,7 +1517,7 @@ public interface WindowManagerPolicy { /** * 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 21e39f6408ed..7d9538f737d7 100644 --- a/core/java/com/android/internal/statusbar/IStatusBar.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl @@ -102,9 +102,9 @@ oneway interface IStatusBar 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. |