diff options
| author | 2016-06-28 16:28:34 +0000 | |
|---|---|---|
| committer | 2016-06-28 16:28:34 +0000 | |
| commit | a2ffb20c0680613d61d6822bc717a83c4ac00897 (patch) | |
| tree | e37fcf5b15bd6d05eab425951d217aa3e1175ea5 | |
| parent | 0d27e2d62489ecc13e021c99c7e9a8b657ecd460 (diff) | |
| parent | 6ec78a64583d74085a046a9bc8b265d230b4a520 (diff) | |
Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458
Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a
| -rw-r--r-- | docs/html/preview/features/picture-in-picture.jd | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/html/preview/features/picture-in-picture.jd b/docs/html/preview/features/picture-in-picture.jd index c089feb17670..03a17682a0a4 100644 --- a/docs/html/preview/features/picture-in-picture.jd +++ b/docs/html/preview/features/picture-in-picture.jd @@ -220,7 +220,11 @@ in any area that can be obscured by the PIP window.</p> <p>When an activity is in PIP mode, by default it doesn't get input focus. To receive input events while in PIP mode, use -<code>MediaSession.setMediaButtonReceiver()</code>.</p> +{@link android.media.session.MediaSession#setCallback +MediaSession.setCallback()}. For more information on using +{@link android.media.session.MediaSession#setCallback setCallback()} see +<a href="{@docRoot}training/tv/playback/now-playing.html">Displaying +a Now Playing Card</a>.</p> <p>When your app is in PIP mode, video playback in the PIP window can cause audio interference with another app, such as a music player app or voice search @@ -228,4 +232,4 @@ app. To avoid this, request audio focus when you start playing the video, and handle audio focus change notifications, as described in <a href="{@docRoot}training/managing-audio/audio-focus.html">Managing Audio Focus</a>. If you receive notification of audio focus loss when in PIP mode, -pause or stop video playback.</p>
\ No newline at end of file +pause or stop video playback.</p> |