Merge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev

This commit is contained in:
Dan Yu
2016-06-28 16:21:56 +00:00
committed by Android (Google) Code Review

View File

@@ -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 <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 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 <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 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 and handle audio focus change notifications, as described in
<a href="{@docRoot}training/managing-audio/audio-focus.html">Managing Audio <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, Focus</a>. If you receive notification of audio focus loss when in PIP mode,
pause or stop video playback.</p> pause or stop video playback.</p>