commit 5fb5179a758aaf42e3ba51f1f784534974acc6df
author Quddus Chong <quddusc@google.com> Fri Oct 17 16:09:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 17 16:09:50 2014 +0000
tree 53b88fc0c68b8eca02cde68065d8af0381188015
parent ab0b33ba394cc20ed7a8c88165890837d772ad31
parent 15d2e768d67b23fc374895dac8024d40598ffc72

am 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode." into lmp-dev

* commit '15d2e768d67b23fc374895dac8024d40598ffc72':
  docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode.

docs/html/about/versions/android-5.0.jd

diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd
index 0ca9212..6a6f589 100644
--- a/docs/html/about/versions/android-5.0.jd
+++ b/docs/html/about/versions/android-5.0.jd
@@ -228,10 +228,9 @@
 {@link android.app.Notification.Builder} methods to add sounds and
 vibration.</p>
 
-<p>Setting the device to
-{@link android.media.AudioManager#RINGER_MODE_SILENT RINGER_MODE_SILENT} now
-causes the device to enter the new priority mode. The device stays in priority
-mode when you leave silent mode.</p>
+<p>Setting a device to {@link android.media.AudioManager#RINGER_MODE_NORMAL RINGER_MODE_NORMAL}
+  or {@link android.media.AudioManager#RINGER_MODE_NORMAL RINGER_MODE_VIBRATE}
+  causes the device to leave priority mode.</p>
 
 <p>Previously, Android used {@link android.media.AudioManager#STREAM_MUSIC STREAM_MUSIC}
 as the master stream to control volume on tablet devices. In Android 5.0, the
@@ -1179,7 +1178,7 @@
 
 <h3 id="Permissions">User permissions</h3>
 
-<p>The following permissions are now supported in the
+<p>The following permission is now supported in the
 <a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">{@code &lt;uses-permission&gt;}</a>
 element to declare the permissions your app requires to access certain APIs.</p>
 
@@ -1188,10 +1187,4 @@
   level 21 and higher, this permission is required by a
   <a href="{@docRoot}about/versions/android-4.2.html#Daydream">Daydream</a> service,
   to ensure that only the system can bind to it.</li>
-
-<li>{@link android.Manifest.permission#READ_VOICEMAIL}: Required to allow your
-  app to read voicemails in the system.</li>
-
-<li>{@link android.Manifest.permission#WRITE_VOICEMAIL}: Required to allow your
-  app to modify and remove existing voicemails in the system.</li>
 </ul>
\ No newline at end of file

docs/html/training/tv/tif/index.jd

diff --git a/docs/html/training/tv/tif/index.jd b/docs/html/training/tv/tif/index.jd
index dc191f9..4746e42 100644
--- a/docs/html/training/tv/tif/index.jd
+++ b/docs/html/training/tv/tif/index.jd
@@ -1,8 +1,19 @@
 page.title=Building Live TV Apps
 page.tags=tif
+page.article=true
 
 @jd:body
 
+<div id="tb-wrapper">
+<div id="tb">
+  <h2>You should also read</h2>
+  <ul>
+    <li><a href="{@docRoot}reference/android/media/tv/package-summary.html">
+      android.media.tv</a></li>
+  </ul>
+</div>
+</div>
+
 <p>
   Watching live television shows and other continuous, channel-based content is a big part of the
   TV experience. Android supports receiving and playback of live video content through the TV Input