diff options
| author | 2016-06-24 11:13:40 -0700 | |
|---|---|---|
| committer | 2016-06-24 11:13:40 -0700 | |
| commit | aa67ac1817e29854d8aa3400245bee68f485c6f5 (patch) | |
| tree | 5796dfa4a57e9854792f4d622aee85416df84e7c | |
| parent | 34f5924ca667ca2178d220c806054d20faf461a7 (diff) | |
| parent | ac5b340487d2342b6f0d4a0a946fb58b530d4040 (diff) | |
resolve merge conflicts of ac5b340 to nyc-dev
Change-Id: I3a7af34cdf7656896a3895c61c8c58d6f8f094a0
| -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> |