Merge "docs: Updating PIP N preview docs for DP2" into mnc-mr-docs

am: f5b6b18

* commit 'f5b6b18a0c98d3fb04a985de4b701a7d83c505dd':
  docs: Updating PIP N preview docs for DP2

Change-Id: I8d9b691ca58f4a9544ac32db40d3a053bee5c8e5
This commit is contained in:
Daniel Yu
2016-04-08 22:27:42 +00:00
committed by android-build-merger

View File

@@ -99,15 +99,15 @@ in the PIP window.</p>
<h2 id="pip_button">Switching Your Activity to Picture-in-picture</h2> <h2 id="pip_button">Switching Your Activity to Picture-in-picture</h2>
When you need to switch your activity into PIP mode, call When you need to switch your activity into PIP mode, call
<code>Activity.enterPictureInPicture()</code>. The following example switches <code>Activity.enterPictureInPictureMode()</code>. The following example
to PIP mode when the user selects a dedicated PIP button on a media control switches to PIP mode when the user selects a dedicated PIP button on a media
bar:</p> control bar:</p>
<pre> <pre>
&#64;Override &#64;Override
public void onActionClicked(Action action) { public void onActionClicked(Action action) {
if (action.getId() == R.id.lb_control_picture_in_picture) { if (action.getId() == R.id.lb_control_picture_in_picture) {
getActivity().enterPictureInPicture(); getActivity().enterPictureInPictureMode();
return; return;
} }
... ...
@@ -129,14 +129,14 @@ control bar PIP actions and uses the PIP icon.</p>
<p>When your activity enters PIP mode, your activity should only show video <p>When your activity enters PIP mode, your activity should only show video
playback. Remove UI elements before your activity enters PIP, playback. Remove UI elements before your activity enters PIP,
and restore these elements when your activity becomes full-screen again. and restore these elements when your activity becomes full-screen again.
Override <code>Activity.onPictureInPictureChanged()</code> or Override <code>Activity.onPictureInPictureModeChanged()</code> or
<code>Fragment.onPictureInPictureChanged()</code> and enable or <code>Fragment.onPictureInPictureModeChanged()</code> and enable or
disable your UI elements as needed, for example:</p> disable your UI elements as needed, for example:</p>
<pre> <pre>
&#64;Override &#64;Override
public void onPictureInPictureChanged(boolean inPictureInPicture) { public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
if (inPictureInPicture) { if (isInPictureInPictureMode) {
// Hide the controls in picture-in-picture mode. // Hide the controls in picture-in-picture mode.
... ...
} else { } else {
@@ -159,8 +159,8 @@ example:</p>
<pre> <pre>
&#64;Override &#64;Override
public void onPause() { public void onPause() {
// If called due to PIP, do not pause playback // If called while in PIP mode, do not pause playback
if (inPictureInPicture()) { if (isInPictureInPictureMode()) {
// Continue playback // Continue playback
... ...
} }