summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Yu <dsyu@google.com> 2016-06-28 16:21:56 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-28 16:21:57 +0000
commit6ec78a64583d74085a046a9bc8b265d230b4a520 (patch)
tree458496936730f8afe75e701c9284e38a845655ab
parent5f72b129c4f2396d2139ef0ed91f2d83054c1add (diff)
parentaa67ac1817e29854d8aa3400245bee68f485c6f5 (diff)
Merge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev
-rw-r--r--docs/html/preview/features/picture-in-picture.jd8
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>