commit ae0ce515b321f184cf8571a65e9424e4a70d0921
author Kevin Hufnagle <khufnagle@google.com> Tue Mar 22 21:54:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 22 21:54:42 2016 +0000
tree 841e9daa5e9bdf968a1fe835b9643ba1fcdbe661
parent a5970ec49ad81e75198649628a541b245127430c
parent b6d1723550a6eb4cf39e721122970f8b364c6cbb

Merge "docs: Added link to AFW Updates within N overview." into mnc-mr-docs

docs/html/preview/download-ota.jd

diff --git a/docs/html/preview/download-ota.jd b/docs/html/preview/download-ota.jd
index 9c20420..68f3c74 100644
--- a/docs/html/preview/download-ota.jd
+++ b/docs/html/preview/download-ota.jd
@@ -230,18 +230,18 @@
   <tr id="volantis">
     <td>Nexus 9 <br>"volantis"</td>
     <td><a href="#top" onclick="onDownload(this)"
-      >volantis-ota-2659757-257cba86.zip</a><br>
-      MD5: d90a271b6c6edc49702df292abc66fed<br>
-      SHA-1: 257cba864cec7f486e0deba9e23e00b840f9a821
+      >volantis-ota-NPC56X-2785955f.zip</a><br>
+      MD5: 36d813350fd660ab751a434782f5523f<br>
+      SHA-1: 2785955fd77310106d2fa9f02f93b595d77b8e72
     </td>
   </tr>
 
   <tr id="volantisg">
     <td>Nexus 9G <br>"volantisg"</td>
     <td><a href="#top" onclick="onDownload(this)"
-      >volantisg-ota-2659757-edd866f6.zip</a><br>
-      MD5: d2bc6f760a1725a36366bb8c3230dfc7<br>
-      SHA-1: edd866f643d87d56654326ba5dc4d802e0d5c2e6
+      >volantisg-ota-NPC56X-d93e161c.zip</a><br>
+      MD5: 1fb7d83cd065a962dbed49e72db97dc4<br>
+      SHA-1: d93e161c15503dc641b654f6ef4c1611222bc9fd
     </td>
   </tr>
 

docs/html/preview/features/picture-in-picture.jd

diff --git a/docs/html/preview/features/picture-in-picture.jd b/docs/html/preview/features/picture-in-picture.jd
index e0fb0bb..106ad8b 100644
--- a/docs/html/preview/features/picture-in-picture.jd
+++ b/docs/html/preview/features/picture-in-picture.jd
@@ -17,6 +17,8 @@
 </li>
   <li><a href="#continuing_playback">Continuing Video Playback While in
 Picture-in-picture</a></li>
+  <li><a href="#single_playback">Using a Single Playback Activity for
+Picture-in-picture</a></li>
   <li><a href="#best">Best Practices</a></li>
 </ol>
 
@@ -170,6 +172,31 @@
 <p>When your activity switches out of PIP mode back to full-screen mode, the
 system resumes your activity and calls your <code>onResume()</code> method.</p>
 
+<h2 id="single_playback">Using a Single Playback Activity for
+Picture-in-picture</h2>
+
+<p>In your app, a user might select a new video when browsing for content on
+the main screen, while a video playback activity is in PIP mode. Play the new
+video in the existing playback activity in full screen mode, instead of
+launching a new activity that might confuse the user.</p>
+
+<p>To ensure a single activity is used for video playback requests and
+switched into or out of PIP mode as needed, set the activity's
+<code>android:launchMode</code> to <code>singleTask</code> in your manifest:
+</p>
+
+<pre>
+&lt;activity android:name="VideoActivity"
+    ...
+    android:supportsPictureInPicture="true"
+    android:launchMode="singleTask"
+    ...
+</pre>
+
+<p>In your activity, override {@link android.app.Activity#onNewIntent
+Activity.onNewIntent()} and handle the new video, stopping any existing video
+playback if needed.</p>
+
 <h2 id="best">Best Practices</h2>
 
 <p>PIP is intended for activities that play full-screen video. When switching